diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php b/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
similarity index 79%
rename from core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
rename to core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
index 636bd31..9bf2c80 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Database/EmptyStatementTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/EmptyStatementTest.php
@@ -5,16 +5,16 @@
  * Definition of Drupal\system\Tests\Database\EmptyStatementTest.
  */
 
-namespace Drupal\system\Tests\Database;
+namespace Drupal\Tests\Core\Database;
 
 use Drupal\Core\Database\StatementEmpty;
 use Drupal\Core\Database\StatementInterface;
-use Drupal\simpletest\UnitTestBase;
+use Drupal\Tests\UnitTestCase;
 
 /**
  * Tests the empty pseudo-statement class.
  */
-class EmptyStatementTest extends UnitTestBase {
+class EmptyStatementTest extends UnitTestCase {
   public static function getInfo() {
     return array(
       'name' => 'Empty statement',
@@ -43,8 +43,6 @@ function testEmptyIteration() {
       $this->fail('Iterating empty result set should not iterate.');
       return;
     }
-
-    $this->pass('Iterating empty result set skipped iteration.');
   }
 
   /**
@@ -53,6 +51,6 @@ function testEmptyIteration() {
   function testEmptyFetchAll() {
     $result = new StatementEmpty();
 
-    $this->assertEqual($result->fetchAll(), array(), 'Empty array returned from empty result set.');
+    $this->assertEquals($result->fetchAll(), array(), 'Empty array returned from empty result set.');
   }
 }