diff --git a/cache/classes/factory.php b/cache/classes/factory.php
index 067fe931852..fd782224971 100644
--- a/cache/classes/factory.php
+++ b/cache/classes/factory.php
@@ -345,7 +345,7 @@ class cache_factory {
             // We have just a single class for PHP unit tests. We don't care enough about its
             // performance to do otherwise and having a single method allows us to inject things into it
             // while testing.
-            $class = 'cache_config_phpunittest';
+            $class = 'cache_config_testing';
         }
 
         // Check if we need to create a config file with defaults.
diff --git a/cache/stores/session/tests/session_test.php b/cache/stores/session/tests/session_test.php
index ebf70599e17..8e7528ae448 100644
--- a/cache/stores/session/tests/session_test.php
+++ b/cache/stores/session/tests/session_test.php
@@ -49,7 +49,7 @@ class cachestore_session_test extends cachestore_tests {
      * Test the maxsize option.
      */
     public function test_maxsize() {
-        $config = cache_config_phpunittest::instance();
+        $config = cache_config_testing::instance();
         $config->phpunit_add_definition('phpunit/one', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -171,7 +171,7 @@ class cachestore_session_test extends cachestore_tests {
     }
 
     public function test_ttl() {
-        $config = cache_config_phpunittest::instance();
+        $config = cache_config_testing::instance();
         $config->phpunit_add_definition('phpunit/three', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
diff --git a/cache/stores/static/tests/static_test.php b/cache/stores/static/tests/static_test.php
index c9795d176b8..0597e9bd6ec 100644
--- a/cache/stores/static/tests/static_test.php
+++ b/cache/stores/static/tests/static_test.php
@@ -50,7 +50,7 @@ class cachestore_static_test extends cachestore_tests {
      */
     public function test_maxsize() {
         $defid = 'phpunit/testmaxsize';
-        $config = cache_config_phpunittest::instance();
+        $config = cache_config_testing::instance();
         $config->phpunit_add_definition($defid, array(
             'mode' => cache_store::MODE_REQUEST,
             'component' => 'phpunit',
diff --git a/cache/tests/administration_helper_test.php b/cache/tests/administration_helper_test.php
index 68f8d9576b7..95c70de7515 100644
--- a/cache/tests/administration_helper_test.php
+++ b/cache/tests/administration_helper_test.php
@@ -48,7 +48,7 @@ class core_cache_administration_helper_testcase extends advanced_testcase {
     public function setUp() {
         parent::setUp();
         cache_factory::reset();
-        cache_config_phpunittest::create_default_configuration();
+        cache_config_testing::create_default_configuration();
     }
 
     /**
@@ -193,7 +193,7 @@ class core_cache_administration_helper_testcase extends advanced_testcase {
         set_debugging(DEBUG_ALL);
 
         // First with simplekeys
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/hashtest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
diff --git a/cache/tests/cache_test.php b/cache/tests/cache_test.php
index 9e003720de4..2d1f194f28c 100644
--- a/cache/tests/cache_test.php
+++ b/cache/tests/cache_test.php
@@ -47,7 +47,7 @@ class core_cache_testcase extends advanced_testcase {
     public function setUp() {
         parent::setUp();
         cache_factory::reset();
-        cache_config_phpunittest::create_default_configuration();
+        cache_config_testing::create_default_configuration();
     }
 
     /**
@@ -90,9 +90,9 @@ class core_cache_testcase extends advanced_testcase {
         }
 
         $instance = cache_config::instance();
-        $this->assertInstanceOf('cache_config_phpunittest', $instance);
+        $this->assertInstanceOf('cache_config_testing', $instance);
 
-        $this->assertTrue(cache_config_phpunittest::config_file_exists());
+        $this->assertTrue(cache_config_testing::config_file_exists());
 
         $stores = $instance->get_all_stores();
         $this->assertCount(3, $stores);
@@ -150,7 +150,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests for cache keys that would break on windows.
      */
     public function test_windows_nasty_keys() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/windowskeytest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -171,7 +171,7 @@ class core_cache_testcase extends advanced_testcase {
         $this->assertInstanceOf('cache_application', $cache);
         $this->run_on_cache($cache);
 
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/test_default_application_cache', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -206,7 +206,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests using a cache system when there are no stores available (who knows what the admin did to achieve this).
      */
     public function test_on_cache_without_store() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/nostoretest1', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -435,7 +435,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests a definition using a data loader
      */
     public function test_definition_data_loader() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/datasourcetest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -476,7 +476,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests a definition using an overridden loader
      */
     public function test_definition_overridden_loader() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/overridetest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -501,8 +501,8 @@ class core_cache_testcase extends advanced_testcase {
      * Test the mappingsonly setting.
      */
     public function test_definition_mappings_only() {
-        /** @var cache_config_phpunittest $instance */
-        $instance = cache_config_phpunittest::instance(true);
+        /** @var cache_config_testing $instance */
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/mappingsonly', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -530,7 +530,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test a very basic definition.
      */
     public function test_definition() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/test', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -548,7 +548,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test a definition using the simple keys.
      */
     public function test_definition_simplekeys() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/simplekeytest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -574,7 +574,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test a negative TTL on an application cache.
      */
     public function test_application_ttl_negative() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/ttltest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -623,7 +623,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test a positive TTL on an application cache.
      */
     public function test_application_ttl_positive() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/ttltest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -672,7 +672,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test a negative TTL on an session cache.
      */
     public function test_session_ttl_positive() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/ttltest', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -721,7 +721,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests manual locking operations on an application cache
      */
     public function test_application_manual_locking() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/lockingtest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -750,7 +750,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests application cache event invalidation
      */
     public function test_application_event_invalidation() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -785,7 +785,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests session cache event invalidation
      */
     public function test_session_event_invalidation() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/test_session_event_invalidation', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -821,7 +821,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests application cache definition invalidation
      */
     public function test_application_definition_invalidation() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/definitioninvalidation', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -857,7 +857,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests session cache definition invalidation
      */
     public function test_session_definition_invalidation() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/test_session_definition_invalidation', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -901,7 +901,7 @@ class core_cache_testcase extends advanced_testcase {
         // We need to add data the to cache, invalidate it by event, manually force it back without MUC knowing to simulate a
         // disconnected/distributed setup (think load balanced server using local cache), instantiate the cache again and finally
         // check that it is not picked up.
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -939,7 +939,7 @@ class core_cache_testcase extends advanced_testcase {
 
         // Test 1: Rebuild without the event and test its there.
         cache_factory::reset();
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -952,7 +952,7 @@ class core_cache_testcase extends advanced_testcase {
 
         // Test 2: Rebuild and test the invalidation of the event via the invalidation cache.
         cache_factory::reset();
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/eventinvalidationtest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -971,7 +971,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests application cache event purge
      */
     public function test_application_event_purge() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/eventpurgetest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1022,7 +1022,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests session cache event purge
      */
     public function test_session_event_purge() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/eventpurgetest', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -1073,7 +1073,7 @@ class core_cache_testcase extends advanced_testcase {
      * Tests application cache definition purge
      */
     public function test_application_definition_purge() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/definitionpurgetest', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1108,7 +1108,7 @@ class core_cache_testcase extends advanced_testcase {
         }
         $this->resetAfterTest();
         $CFG->altcacheconfigpath = $CFG->dataroot.'/cache/altcacheconfigpath';
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $this->assertInstanceOf('cache_config', $instance);
     }
 
@@ -1116,7 +1116,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test disabling the cache stores.
      */
     public function test_disable_stores() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/disabletest1', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1245,14 +1245,14 @@ class core_cache_testcase extends advanced_testcase {
 
         $factory = cache_factory::instance(true);
         $config = $factory->create_config_instance();
-        $this->assertEquals('cache_config_phpunittest', get_class($config));
+        $this->assertEquals('cache_config_testing', get_class($config));
     }
 
     /**
      * Test that multiple application loaders work ok.
      */
     public function test_multiple_application_loaders() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_file_store('phpunittest1');
         $instance->phpunit_add_file_store('phpunittest2');
         $instance->phpunit_add_definition('phpunit/multi_loader', array(
@@ -1320,8 +1320,8 @@ class core_cache_testcase extends advanced_testcase {
      * Test that multiple application loaders work ok.
      */
     public function test_multiple_session_loaders() {
-        /* @var cache_config_phpunittest $instance */
-        $instance = cache_config_phpunittest::instance(true);
+        /* @var cache_config_testing $instance */
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_session_store('phpunittest1');
         $instance->phpunit_add_session_store('phpunittest2');
         $instance->phpunit_add_definition('phpunit/multi_loader', array(
@@ -1418,7 +1418,7 @@ class core_cache_testcase extends advanced_testcase {
      */
     public function test_session_cache_switch_user_application_mapping() {
         $this->resetAfterTest(true);
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_file_store('testfilestore');
         $instance->phpunit_add_definition('phpunit/testappsession', array(
             'mode' => cache_store::MODE_SESSION,
@@ -1453,7 +1453,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test two session caches being used at once to confirm collisions don't occur.
      */
     public function test_dual_session_caches() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/testsess1', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -1518,7 +1518,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test application locking.
      */
     public function test_application_locking() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/test_application_locking', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1544,7 +1544,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test the static cache_helper method purge_stores_used_by_definition.
      */
     public function test_purge_stores_used_by_definition() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/test_purge_stores_used_by_definition', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1566,7 +1566,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test purge routines.
      */
     public function test_purge_routines() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/purge1', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1613,7 +1613,7 @@ class core_cache_testcase extends advanced_testcase {
      * Test that the default stores all support searching.
      */
     public function test_defaults_support_searching() {
-        $instance = cache_config_phpunittest::instance(true);
+        $instance = cache_config_testing::instance(true);
         $instance->phpunit_add_definition('phpunit/search1', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
@@ -1660,7 +1660,7 @@ class core_cache_testcase extends advanced_testcase {
     }
 
     public function test_static_acceleration() {
-        $instance = cache_config_phpunittest::instance();
+        $instance = cache_config_testing::instance();
         $instance->phpunit_add_definition('phpunit/accelerated', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
diff --git a/cache/tests/config_writer_test.php b/cache/tests/config_writer_test.php
index f49f65ee317..12b6291ed75 100644
--- a/cache/tests/config_writer_test.php
+++ b/cache/tests/config_writer_test.php
@@ -47,7 +47,7 @@ class core_cache_config_writer_testcase extends advanced_testcase {
     public function setUp() {
         parent::setUp();
         cache_factory::reset();
-        cache_config_phpunittest::create_default_configuration();
+        cache_config_testing::create_default_configuration();
     }
 
     /**
@@ -261,7 +261,7 @@ class core_cache_config_writer_testcase extends advanced_testcase {
      * Test setting some definition mappings.
      */
     public function test_set_definition_mappings() {
-        $config = cache_config_phpunittest::instance(true);
+        $config = cache_config_testing::instance(true);
         $config->phpunit_add_definition('phpunit/testdefinition', array(
             'mode' => cache_store::MODE_APPLICATION,
             'component' => 'phpunit',
diff --git a/cache/tests/fixtures/lib.php b/cache/tests/fixtures/lib.php
index 9516ccbefa8..b17d4bf32bf 100644
--- a/cache/tests/fixtures/lib.php
+++ b/cache/tests/fixtures/lib.php
@@ -31,12 +31,16 @@ defined('MOODLE_INTERNAL') || die();
 require_once($CFG->dirroot.'/cache/locallib.php');
 
 /**
- * Override the default cache configuration for our own maniacle purposes.
+ * Override the default cache configuration for our own maniacal purposes.
  *
- * @copyright  2012 Sam Hemelryk
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * This class was originally named cache_config_phpunittest but was renamed in 2.9
+ * because it is used for both unit tests and acceptance tests.
+ *
+ * @since 2.9
+ * @copyright 2012 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class cache_config_phpunittest extends cache_config_writer {
+class cache_config_testing extends cache_config_writer {
 
     /**
      * Creates the default configuration and saves it.
@@ -287,6 +291,21 @@ class cache_config_phpunittest extends cache_config_writer {
     }
 }
 
+/**
+ * This is a deprecated class. It has been renamed to cache_config_testing.
+ *
+ * This was deprecated in Moodle 2.9 but will be removed at the next major release
+ * as it is only used during testing and its highly unlikely anyone has used this.
+ *
+ * @deprecated since 2.9
+ * @copyright  2014 Sam Hemelryk
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class cache_config_phpunittest extends cache_config_testing {
+    // We can't do anything here to warn the user.
+    // The cache can be utilised before sessions have even been started.
+}
+
 /**
  * Dummy object for testing cacheable object interface and interaction
  *