Index: sys/dev/acpica/acpi_timer.c
===================================================================
--- sys/dev/acpica/acpi_timer.c
+++ sys/dev/acpica/acpi_timer.c
@@ -79,6 +79,8 @@
 static void	acpi_timer_boot_test(void);
 
 static int	acpi_timer_test(void);
+static int	acpi_timer_test_enabled = 1;
+TUNABLE_INT("hw.acpi.timer_test_enabled", &acpi_timer_test_enabled);
 
 static device_method_t acpi_timer_methods[] = {
     DEVMETHOD(device_identify,	acpi_timer_identify),
@@ -404,6 +406,12 @@
     int delta, max, max2, min, n;
     register_t s;
 
+    /* Skip the test based on the hw.acpi.timer_test_enabled tunable. */
+    if (!acpi_timer_test_enabled)
+	return (1);
+
+    TSENTER();
+
     min = INT32_MAX;
     max = max2 = 0;
 
@@ -434,6 +442,8 @@
     if (bootverbose)
 	printf(" %d/%d", n, delta);
 
+    TSEXIT();
+
     return (n);
 }
 #undef N