diff --git a/tests/fake/simple-site/user/pages/01.home/default.md b/tests/fake/simple-site/user/pages/01.home/default.md
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/01.home/default.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/post-one/item.md b/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/post-two/item.md b/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/03.about/default.md b/tests/fake/simple-site/user/pages/03.about/default.md
new file mode 100644
index 000000000..43bfdf031
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/03.about/default.md
@@ -0,0 +1,5 @@
+---
+title: test
+---
+
+# Test
\ No newline at end of file
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
new file mode 100644
index 000000000..5225f35b7
--- /dev/null
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -0,0 +1,49 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Codeception\Util\Stub;
+use Grav\Common\Grav;
+use Grav\Common\Page\Pages;
+use Grav\Common\Page\Page;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
+/**
+ * Class PagesTest
+ */
+class PagesTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var Pages $pages */
+    protected $pages;
+
+    /** @var Page $root_page */
+    protected $root_page;
+
+    protected function _before()
+    {
+        $this->grav = Fixtures::get('grav');
+        $this->pages = $this->grav['pages'];
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
+        $this->pages->init();
+    }
+
+    public function testAll()
+    {
+        $this->assertTrue(is_object($this->pages->all()));
+        $this->assertTrue(is_array($this->pages->all()->toArray()));
+        $this->assertInstanceOf('Grav\Common\Page\Page', $this->pages->all()->first());
+    }
+
+    public function testGetList()
+    {
+        $list = $this->pages->getList();
+        $this->assertTrue(is_array($list));
+        $this->assertSame($list['/'], 'Home');
+        $this->assertSame($list['/blog'], 'Blog');
+    }
+}