diff --git a/modules/system/system.test b/modules/system/system.test
index ae69d1f..70eff34 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -2149,3 +2149,34 @@ class SystemAuthorizeCase extends DrupalWebTestCase {
     $this->assertText('System Test Username');
   }
 }
+
+/**
+ * Unit tests for template_preprocess_page().
+ */
+class PageTemplateSuggestionsUnitTest extends DrupalUnitTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Page template suggestions',
+      'description' => 'Test the template_preprocess_page() function returns
+                        appropriate template suggestions.',
+      'group' => 'System',
+    );
+  }
+
+  /**
+   * Test if theme_get_suggestions() handles the suggestions correctly.
+   */
+  function testThemeGetSuggestions() {
+    // Define standard path to be preprocessed
+    $arg = array('node', '1', 'edit');
+    $suggestions = theme_get_suggestions($arg, 'page');
+    $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1', 'page__node__edit'),
+                       t('Found expected page suggestions for standard paths.'));
+
+    // Define standard path to be preprocessed
+    $arg = array('node', '1', 'hyphen-path');
+    $suggestions = theme_get_suggestions($arg, 'page');
+    $this->assertEqual($suggestions, array('page__node', 'page__node__%', 'page__node__1', 'page__node__hyphen_path'),
+                       t('Found expected page suggestions for paths containing hyphens.'));
+  }
+}