diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run
index 462e55a7f1..bdcd208444 100644
--- a/repos/os/run/timeout.run
+++ b/repos/os/run/timeout.run
@@ -35,6 +35,23 @@ proc precise_time { } {
 	return true
 }
 
+#
+# Wether the platform allows for a 'Timer::Connection::elapsed_ms'
+# implementation that has a precision < 2 ms
+#
+proc precise_ref_time { } {
+
+	#
+	# On platforms that use the PIT timer driver, 'elapsed_ms' is pretty
+	# inprecise/unsteady (up to 3 ms deviation) for a reason that is not
+	# clearly determined yet. On Fiasco and Fiasco.OC, that use kernel timing,
+	# it is the same. So, on these platforms, our locally interpolated time
+	# seems to be fine but the reference time is bad.
+	#
+	if {[have_spec sel4] || [have_spec pistachio] || [have_spec okl4] || [have_spec foc] || [have_spec fiasco]} { return false }
+	return true
+}
+
 build "core init drivers/platform drivers/timer test/timeout test/cpufreq"
 
 #
@@ -67,6 +84,7 @@ append config {
 			<binary name="test-timeout"/>
 			<resource name="RAM" quantum="250M"/>
 			<config precise_time="} [precise_time] {"
+			        precise_ref_time="} [precise_ref_time] {"/>
 			        precise_timeouts="} [precise_timeouts] {"/>
 		</start>
 	</config>
diff --git a/repos/os/src/test/timeout/main.cc b/repos/os/src/test/timeout/main.cc
index 7d10927fc6..f9cc77ecc9 100644
--- a/repos/os/src/test/timeout/main.cc
+++ b/repos/os/src/test/timeout/main.cc
@@ -199,7 +199,6 @@ struct Fast_polling : Test
 	enum { STACK_SIZE            = 4 * 1024 * sizeof(addr_t) };
 	enum { MIN_TIME_COMPARISONS  = 100 };
 	enum { MAX_TIME_ERR_US       = 10000 };
-	enum { MAX_AVG_TIME_ERR_US   = 1000 };
 	enum { MAX_DELAY_ERR_US      = 2000 };
 	enum { MAX_AVG_DELAY_ERR_US  = 20 };
 	enum { MAX_POLL_LATENCY_US   = 1000 };
@@ -228,6 +227,9 @@ struct Fast_polling : Test
 	Result_buffer          local_us_2      { env };
 	Result_buffer          remote_ms       { env };
 
+	unsigned long max_avg_time_err_us { config.xml().attribute_value("precise_ref_time", true) ?
+	                                    1000UL : 2000UL };
+
 	unsigned const delay_loops_per_poll[NR_OF_ROUNDS] {      1,
 	                                                      1000,
 	                                                     10000,
@@ -520,7 +522,7 @@ struct Fast_polling : Test
 
 			bool const error_nr_of_good_polls = (nr_of_good_polls          < MIN_NR_OF_POLLS);
 			bool const error_nr_of_time_cmprs = (avg_time_err_us.avg_cnt() < MIN_TIME_COMPARISONS);
-			bool const error_avg_time_err     = (avg_time_err_us.avg()     > MAX_AVG_TIME_ERR_US);
+			bool const error_avg_time_err     = (avg_time_err_us.avg()     > max_avg_time_err_us);
 			bool const error_max_time_err     = (max_time_err_us           > MAX_TIME_ERR_US);
 			bool const error_avg_delay_err    = (avg_delay_err_us.avg()    > max_avg_delay_err_us);
 
@@ -533,7 +535,7 @@ struct Fast_polling : Test
 			log(error_nr_of_good_polls ? "\033[31mbad:  " : "good: ", "nr of good polls       ", nr_of_good_polls,            " (min ", (unsigned)MIN_NR_OF_POLLS,              ")\033[0m");
 			log(                                            "      ", "nr of bad polls        ", nr_of_bad_polls                                                                          );
 			log(error_nr_of_time_cmprs ? "\033[31mbad:  " : "good: ", "nr of time comparisons ", avg_time_err_us.avg_cnt(),   " (min ", (unsigned)MIN_TIME_COMPARISONS,         ")\033[0m");
-			log(error_avg_time_err     ? "\033[31mbad:  " : "good: ", "average time error     ", avg_time_err_us.avg(),    " us (max ", (unsigned long)MAX_AVG_TIME_ERR_US,  " us)\033[0m");
+			log(error_avg_time_err     ? "\033[31mbad:  " : "good: ", "average time error     ", avg_time_err_us.avg(),    " us (max ", (unsigned long)max_avg_time_err_us,  " us)\033[0m");
 			log(error_max_time_err     ? "\033[31mbad:  " : "good: ", "maximum time error     ", max_time_err_us,          " us (max ", (unsigned long)MAX_TIME_ERR_US,      " us)\033[0m");
 			log(                                            "      ", "average delay          ", avg_delay_us.avg(),       " us"                                                          );
 			log(error_avg_delay_err    ? "\033[31mbad:  " : "good: ", "average delay error    ", avg_delay_err_us.avg(),   " us (max ", max_avg_delay_err_us,                " us)\033[0m");