diff --git a/core/modules/system/lib/Drupal/system/Tests/Render/TypeTableTest.php b/core/modules/system/lib/Drupal/system/Tests/Render/TypeTableTest.php
new file mode 100644
index 0000000..ae2a9d0
--- /dev/null
+++ b/core/modules/system/lib/Drupal/system/Tests/Render/TypeTableTest.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\system\Tests\Render\TypeTableTest.
+ */
+
+namespace Drupal\system\Tests\Render;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Functional tests for #type table.
+ */
+class TypeTableTest extends WebTestBase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Type Table',
+      'description' => "Tests #type 'table' render functions.",
+      'group' => 'Render',
+    );
+  }
+
+  /**
+   * Tests that #type table rows can be rendered from the #rows property.
+   */
+  function testRenderTableFromRows() {
+    $table = array(
+      '#type' => 'table',
+      '#rows' => array(
+        array('Foo', 'Bar', array('data' => array('#markup' => 'Baz'))),
+      ),
+    );
+    $this->content = drupal_render($table);
+    $this->assertRaw('<tr class="odd"><td>Foo</td><td>Bar</td><td>Baz</td> </tr>', 'Table row rendered from #rows property.');
+  }
+
+  /**
+   * Tests that #type table rows can be rendered from sets of render arrays.
+   */
+  function testRenderTableFromChildren() {
+    $table = array(
+      '#type' => 'table',
+      array(
+        array('#markup' => 'Foo'),
+        array('#markup' => 'Bar'),
+        array('#markup' => 'Baz'),
+      ),
+    );
+    $this->content = drupal_render($table);
+    $this->assertRaw('<tr class="odd"><td>Foo</td><td>Bar</td><td>Baz</td> </tr>', 'Table row rendered from child render elements.');
+  }
+
+  /**
+   * Tests that tablesort functionality can be added to #type table elements.
+   */
+  function testRenderTableWithTabledrag() {
+    $this->getUrl('/render-test/type-table-tabledrag');
+    $this->assertRaw('<tr class="draggable odd"><td>Foo 1</td><td>Bar 1</td><td>Baz 1</td><td></td> </tr>\n <tr class="draggable even"><td>Foo 2</td><td>Bar 2</td><td>Baz 2</td> </tr>', 'Table row rendered with tabledrag from child render elements.');
+  }
+
+  /**
+   * Tests the #tableselect feature.
+   */
+  function testRenderTableWithTableselect() {
+
+  }
+}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
index 0dbedd7..2435a3b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
@@ -16,7 +16,7 @@ class TableTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Theme Table',
-      'description' => 'Tests built-in theme functions.',
+      'description' => 'Tests built-in table theme functions.',
       'group' => 'Theme',
     );
   }