diff --git a/test/examples/page_file_dir.git/COMMIT_EDITMSG b/test/examples/page_file_dir.git/COMMIT_EDITMSG
new file mode 100644
index 00000000..80260766
--- /dev/null
+++ b/test/examples/page_file_dir.git/COMMIT_EDITMSG
@@ -0,0 +1 @@
+initial commit
diff --git a/test/examples/page_file_dir.git/HEAD b/test/examples/page_file_dir.git/HEAD
new file mode 100644
index 00000000..cb089cd8
--- /dev/null
+++ b/test/examples/page_file_dir.git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/examples/page_file_dir.git/config b/test/examples/page_file_dir.git/config
new file mode 100644
index 00000000..af107929
--- /dev/null
+++ b/test/examples/page_file_dir.git/config
@@ -0,0 +1,6 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
diff --git a/test/examples/page_file_dir.git/description b/test/examples/page_file_dir.git/description
new file mode 100644
index 00000000..498b267a
--- /dev/null
+++ b/test/examples/page_file_dir.git/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/examples/page_file_dir.git/index b/test/examples/page_file_dir.git/index
new file mode 100644
index 00000000..85640369
Binary files /dev/null and b/test/examples/page_file_dir.git/index differ
diff --git a/test/examples/page_file_dir.git/info/exclude b/test/examples/page_file_dir.git/info/exclude
new file mode 100644
index 00000000..a5196d1b
--- /dev/null
+++ b/test/examples/page_file_dir.git/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/test/examples/page_file_dir.git/logs/HEAD b/test/examples/page_file_dir.git/logs/HEAD
new file mode 100644
index 00000000..60cde1b1
--- /dev/null
+++ b/test/examples/page_file_dir.git/logs/HEAD
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 22b404803c966dd92865614d86ff22ca12e50c1e rick <technoweenie@gmail.com> 1295287591 -0800	commit (initial): initial commit
diff --git a/test/examples/page_file_dir.git/logs/refs/heads/master b/test/examples/page_file_dir.git/logs/refs/heads/master
new file mode 100644
index 00000000..60cde1b1
--- /dev/null
+++ b/test/examples/page_file_dir.git/logs/refs/heads/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 22b404803c966dd92865614d86ff22ca12e50c1e rick <technoweenie@gmail.com> 1295287591 -0800	commit (initial): initial commit
diff --git a/test/examples/page_file_dir.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf b/test/examples/page_file_dir.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf
new file mode 100644
index 00000000..bffaebf0
Binary files /dev/null and b/test/examples/page_file_dir.git/objects/0c/7d27db1f575263efdcab3dc650f4502a2dbcbf differ
diff --git a/test/examples/page_file_dir.git/objects/22/b404803c966dd92865614d86ff22ca12e50c1e b/test/examples/page_file_dir.git/objects/22/b404803c966dd92865614d86ff22ca12e50c1e
new file mode 100644
index 00000000..a52143a1
Binary files /dev/null and b/test/examples/page_file_dir.git/objects/22/b404803c966dd92865614d86ff22ca12e50c1e differ
diff --git a/test/examples/page_file_dir.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99 b/test/examples/page_file_dir.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
new file mode 100644
index 00000000..bdcf704c
Binary files /dev/null and b/test/examples/page_file_dir.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99 differ
diff --git a/test/examples/page_file_dir.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6 b/test/examples/page_file_dir.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
new file mode 100644
index 00000000..cfc3920f
Binary files /dev/null and b/test/examples/page_file_dir.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6 differ
diff --git a/test/examples/page_file_dir.git/objects/5b/43e14e0a15fb6f08feab1773d1c0991e9f71e2 b/test/examples/page_file_dir.git/objects/5b/43e14e0a15fb6f08feab1773d1c0991e9f71e2
new file mode 100644
index 00000000..effa1c00
Binary files /dev/null and b/test/examples/page_file_dir.git/objects/5b/43e14e0a15fb6f08feab1773d1c0991e9f71e2 differ
diff --git a/test/examples/page_file_dir.git/refs/heads/master b/test/examples/page_file_dir.git/refs/heads/master
new file mode 100644
index 00000000..46106185
--- /dev/null
+++ b/test/examples/page_file_dir.git/refs/heads/master
@@ -0,0 +1 @@
+22b404803c966dd92865614d86ff22ca12e50c1e
diff --git a/test/test_wiki.rb b/test/test_wiki.rb
index e8d15568..1f862dd0 100644
--- a/test/test_wiki.rb
+++ b/test/test_wiki.rb
@@ -288,18 +288,9 @@ end
 
 context "page_file_dir option" do
   setup do
-    @path = testpath('examples/pfdtest')
+    @path = cloned_testpath('examples/page_file_dir')
     @repo = Grit::Repo.init(@path)
     @page_file_dir = 'docs'
-    Dir.chdir(@path) do
-      Dir.mkdir(@page_file_dir)
-      File.open("docs/foo.md", "w"){|f| f.print "Hello foo" }
-      @repo.add("docs/foo.md")
-      File.open("bar.md", "w"){|f| f.print "Hello bar" }
-      @repo.add("bar.md")
-      @repo.commit_index("Added docs/foo.md and bar.md")
-    end
-
     @wiki = Gollum::Wiki.new(@path, :page_file_dir => @page_file_dir)
   end
 
@@ -318,7 +309,7 @@ context "page_file_dir option" do
   end
 
   test "search results should be restricted in page filer dir" do
-    results = @wiki.search("Hello")
+    results = @wiki.search("foo")
     assert_equal 1, results.size
     assert_equal "foo", results[0][:name]
   end