diff --git a/tests/TestPages/bad_page.rst b/tests/TestPages/bad_page.rst
new file mode 100644
index 00000000..bc62948b
--- /dev/null
+++ b/tests/TestPages/bad_page.rst
@@ -0,0 +1,8 @@
+This is a test bad page
+#######################
+
+:status: invalid
+
+The quick brown fox jumped over the lazy dog's back.
+
+The status here is invalid, the page should not render.
diff --git a/tests/TestPages/hidden_page.rst b/tests/TestPages/hidden_page.rst
new file mode 100644
index 00000000..57ca329c
--- /dev/null
+++ b/tests/TestPages/hidden_page.rst
@@ -0,0 +1,8 @@
+This is a test hidden page
+##########################
+
+:status: hidden
+
+The quick brown fox jumped over the lazy dog's back.
+
+This page is hidden
diff --git a/tests/TestPages/hidden_page_markdown.md b/tests/TestPages/hidden_page_markdown.md
new file mode 100644
index 00000000..1e532fe7
--- /dev/null
+++ b/tests/TestPages/hidden_page_markdown.md
@@ -0,0 +1,12 @@
+title: This is a markdown test hidden page
+status: hidden
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
+
+This page is hidden
diff --git a/tests/TestPages/page.rst b/tests/TestPages/page.rst
new file mode 100644
index 00000000..2d13976d
--- /dev/null
+++ b/tests/TestPages/page.rst
@@ -0,0 +1,4 @@
+This is a test page
+###################
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/TestPages/page_markdown.md b/tests/TestPages/page_markdown.md
new file mode 100644
index 00000000..d5416a6f
--- /dev/null
+++ b/tests/TestPages/page_markdown.md
@@ -0,0 +1,9 @@
+title: This is a markdown test page
+
+Test Markdown File Header
+=========================
+
+Used for pelican test
+---------------------
+
+The quick brown fox jumped over the lazy dog's back.
diff --git a/tests/test_generators.py b/tests/test_generators.py
index e62551fa..cc84c80f 100644
--- a/tests/test_generators.py
+++ b/tests/test_generators.py
@@ -4,7 +4,7 @@ from mock import MagicMock
 import os
 import re
 
-from pelican.generators import ArticlesGenerator, LessCSSGenerator
+from pelican.generators import ArticlesGenerator, LessCSSGenerator, PagesGenerator
 from pelican.settings import _DEFAULT_CONFIG
 from .support import unittest, temporary_folder, skipIfNoExecutable
 
@@ -94,6 +94,48 @@ class TestArticlesGenerator(unittest.TestCase):
         write.assert_called_count == 0
 
 
+class TestPageGenerator(unittest.TestCase):
+    """
+    Every time you want to test for a new field;
+    Make sure the test pages in "TestPages" have all the fields
+    Add it to distilled in distill_pages_for_test
+    Then update the assertItemsEqual in test_generate_context to match expected
+    """
+
+    def distill_pages_for_test(self, pages):
+        distilled = []
+        for page in pages:
+           distilled.append([
+                    page.title,
+                    page.status
+                ]
+           )
+        return distilled
+
+    def test_generate_context(self):
+        settings = _DEFAULT_CONFIG.copy()
+
+        settings['PAGE_DIR'] = 'TestPages'
+        generator = PagesGenerator(settings.copy(), settings, CUR_DIR,
+                                      _DEFAULT_CONFIG['THEME'], None,
+                                      _DEFAULT_CONFIG['MARKUP'])
+        generator.generate_context()
+        pages = self.distill_pages_for_test(generator.pages)
+        hidden_pages = self.distill_pages_for_test(generator.hidden_pages)
+
+        pages_expected = [
+            [u'This is a test page', 'published'],
+            [u'This is a markdown test page', 'published']
+        ]
+        hidden_pages_expected = [
+            [u'This is a test hidden page', 'hidden'],
+            [u'This is a markdown test hidden page', 'hidden']
+        ]
+
+        self.assertItemsEqual(pages_expected,pages)
+        self.assertItemsEqual(hidden_pages_expected,hidden_pages)
+
+
 class TestLessCSSGenerator(unittest.TestCase):
 
     LESS_CONTENT = """