diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 5ebf9f0c9f..003f17ca88 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -142,6 +142,7 @@
 }
 
 $test_list = simpletest_script_get_test_list();
+shuffle($test_list);
 
 // Try to allocate unlimited time to run the tests.
 drupal_set_time_limit(0);
diff --git a/index.php b/index.php
index 750dc282dc..039f8cfb76 100644
--- a/index.php
+++ b/index.php
@@ -20,3 +20,4 @@
 $response->send();
 
 $kernel->terminate($request, $response);
+apcu_clear_cache();