diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagTest.php
new file mode 100644
index 0000000..c3dc972
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagTest.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Theme\HtmlTagTest.
+ */
+
+namespace Drupal\system\Tests\Theme;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests HTML tag output.
+ */
+class HtmlTagTest extends WebTestBase {
+  public static function getInfo() {
+    return array(
+      'name' => 'HTML tag output',
+      'description' => "Tests output of '#theme' => 'html_tag'.",
+      'group' => 'Theme',
+    );
+  }
+
+  /**
+   * Tests the output of '#theme' => 'html_tag'.
+   */
+  function testThemeHtmlTag() {
+    // Test auto-closure meta tag generation.
+    $tag = array('#theme' => 'html_tag', '#tag' => 'meta', '#attributes' => array('name' => 'description', 'content' => 'Drupal test'));
+    $this->assertEqual('<meta name="description" content="Drupal test" />' . "\n", drupal_render($tag), 'Test auto-closure meta tag generation.');
+
+    // Test title tag generation.
+    $tag = array('#theme' => 'html_tag', '#tag' => 'title', '#value' => 'title test');
+    $this->assertEqual('<title>title test</title>' . "\n", drupal_render($tag), 'Test title tag generation.');
+  }
+}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/PreprocessHtmlTagUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/PreprocessHtmlTagUnitTest.php
deleted file mode 100644
index e5c18cb..0000000
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/PreprocessHtmlTagUnitTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\system\Tests\Theme\PreprocessHtmlTagUnitTest.
- */
-
-namespace Drupal\system\Tests\Theme;
-
-use Drupal\simpletest\UnitTestBase;
-
-/**
- * Unit tests for template_preprocess_html_tag().
- */
-class PreprocessHtmlTagUnitTest extends UnitTestBase {
-  public static function getInfo() {
-    return array(
-      'name' => 'Preprocess HTML Tag',
-      'description' => 'Tests template_preprocess_html_tag() function.',
-      'group' => 'Theme',
-    );
-  }
-
-  /**
-   * Tests template_preprocess_html_tag().
-   */
-  function testPreprocessHtmlTag() {
-    // Test running sample meta tag through the preprocess function.
-    $variables['element'] = array('#tag' => 'meta', '#attributes' => array('name' => 'description', 'content' => 'Drupal test'));
-    template_preprocess_html_tag($variables);
-    $this->assertEqual($variables['tag'], 'meta', "'tag' variable is set to 'meta'.");
-    $this->assertTrue(!isset($variables['value']), "'value' variable is not set when no value is passed in.");
-
-    // Test running sample title tag through the preprocess function.
-    $variables = array();
-    $variables['element'] = array('#tag' => 'title', '#value' => 'title test');
-    template_preprocess_html_tag($variables);
-    $this->assertEqual($variables['tag'], 'title', "'tag' variable is set to 'title'.");
-    $this->assertEqual($variables['value'], 'title test', "'value' variable is equal to the value of '#value' in the element array.");
-  }
-}