diff --git a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
index 55f71cc4f0c..94b74cb6517 100644
--- a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
@@ -240,17 +240,4 @@ class BagOStuffTest extends MediaWikiTestCase {
 		$this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' );
 		$this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' );
 	}
-
-	public function testHashBagEviction() {
-		$cache = new HashBagOStuff( array( 'maxKeys' => 10 ) );
-		for ( $i=0; $i<10; ++$i ) {
-			$cache->set( "key$i", 1 );
-			$this->assertEquals( 1, $cache->get( "key$i" ) );
-		}
-		for ( $i=10; $i<20; ++$i ) {
-			$cache->set( "key$i", 1 );
-			$this->assertEquals( 1, $cache->get( "key$i" ) );
-			$this->assertEquals( false, $cache->get( "key" . $i - 10 ) );
-		}
-	}
 }
diff --git a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
new file mode 100644
index 00000000000..5344e2d51c1
--- /dev/null
+++ b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @group BagOStuff
+ */
+class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
+
+	public function testEvictionOrder() {
+		$cache = new HashBagOStuff( array( 'maxKeys' => 10 ) );
+		for ( $i = 0; $i < 10; $i++ ) {
+			$cache->set( "key$i", 1 );
+			$this->assertEquals( 1, $cache->get( "key$i" ) );
+		}
+		for ( $i = 10; $i < 20; $i++ ) {
+			$cache->set( "key$i", 1 );
+			$this->assertEquals( 1, $cache->get( "key$i" ) );
+			$this->assertEquals( false, $cache->get( "key" . $i - 10 ) );
+		}
+	}
+}