diff --git a/tests/check/code_sniffer_tests.php b/tests/check/code_sniffer_tests.php
index 95f7ee9..77ad34e 100644
--- a/tests/check/code_sniffer_tests.php
+++ b/tests/check/code_sniffer_tests.php
@@ -55,7 +55,7 @@ public function testValidLints()
             array(
                 new pchIssue( E_ERROR, 'cs_errors.php', 12, 'PEAR.Classes.ClassDeclaration: Opening brace of a class must be on the line after the definition' ),
             ),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 4 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 4 ) )
         );
     }
 
@@ -65,7 +65,7 @@ public function testNoErrors()
 
         $this->assertEquals(
             array(),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 5 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 5 ) )
         );
     }
 }
diff --git a/tests/check/lint_tests.php b/tests/check/lint_tests.php
index c4ec327..68ff1ef 100644
--- a/tests/check/lint_tests.php
+++ b/tests/check/lint_tests.php
@@ -53,7 +53,7 @@ public function testValidLints()
 
         $this->assertEquals(
             array(),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 1 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 1 ) )
         );
     }
 
@@ -65,7 +65,7 @@ public function testInvalidLints()
             array(
                 new pchIssue( E_ERROR, 'dir/errneous_file.php', null, "Parse error: syntax error, unexpected T_STRING in - on line 3" ),
             ),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 2 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 2 ) )
         );
     }
 
@@ -75,7 +75,7 @@ public function testValidCustomLints()
 
         $this->assertEquals(
             array(),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 2 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 2 ) )
         );
     }
 
@@ -85,7 +85,7 @@ public function testNoLints()
 
         $this->assertEquals(
             array(),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 3 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 3 ) )
         );
     }
 }
diff --git a/tests/commit_message/check_tests.php b/tests/commit_message/check_tests.php
index bd7a0ca..b92d5e5 100644
--- a/tests/commit_message/check_tests.php
+++ b/tests/commit_message/check_tests.php
@@ -53,7 +53,7 @@ public function testValidCommitMessages()
 
         $this->assertEquals(
             array(),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 1 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 1 ) )
         );
 
         $this->assertEquals(
@@ -94,7 +94,7 @@ public function testInvalidCustomCommitMessages()
             array(
                 new pchIssue( E_ERROR, null, null, $error )
             ),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 1 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 1 ) )
         );
 
         $this->assertEquals(
diff --git a/tests/data/README.txt b/tests/data/repo/README.txt
similarity index 100%
rename from tests/data/README.txt
rename to tests/data/repo/README.txt
diff --git a/tests/data/conf/authz b/tests/data/repo/conf/authz
similarity index 100%
rename from tests/data/conf/authz
rename to tests/data/repo/conf/authz
diff --git a/tests/data/conf/passwd b/tests/data/repo/conf/passwd
similarity index 100%
rename from tests/data/conf/passwd
rename to tests/data/repo/conf/passwd
diff --git a/tests/data/conf/svnserve.conf b/tests/data/repo/conf/svnserve.conf
similarity index 100%
rename from tests/data/conf/svnserve.conf
rename to tests/data/repo/conf/svnserve.conf
diff --git a/tests/data/db/current b/tests/data/repo/db/current
similarity index 100%
rename from tests/data/db/current
rename to tests/data/repo/db/current
diff --git a/tests/data/db/format b/tests/data/repo/db/format
similarity index 100%
rename from tests/data/db/format
rename to tests/data/repo/db/format
diff --git a/tests/data/db/fs-type b/tests/data/repo/db/fs-type
similarity index 100%
rename from tests/data/db/fs-type
rename to tests/data/repo/db/fs-type
diff --git a/tests/data/db/fsfs.conf b/tests/data/repo/db/fsfs.conf
similarity index 100%
rename from tests/data/db/fsfs.conf
rename to tests/data/repo/db/fsfs.conf
diff --git a/tests/data/db/min-unpacked-rev b/tests/data/repo/db/min-unpacked-rev
similarity index 100%
rename from tests/data/db/min-unpacked-rev
rename to tests/data/repo/db/min-unpacked-rev
diff --git a/tests/data/db/rep-cache.db b/tests/data/repo/db/rep-cache.db
similarity index 100%
rename from tests/data/db/rep-cache.db
rename to tests/data/repo/db/rep-cache.db
diff --git a/tests/data/db/revprops/0/0 b/tests/data/repo/db/revprops/0/0
similarity index 100%
rename from tests/data/db/revprops/0/0
rename to tests/data/repo/db/revprops/0/0
diff --git a/tests/data/db/revprops/0/1 b/tests/data/repo/db/revprops/0/1
similarity index 100%
rename from tests/data/db/revprops/0/1
rename to tests/data/repo/db/revprops/0/1
diff --git a/tests/data/db/revprops/0/2 b/tests/data/repo/db/revprops/0/2
similarity index 100%
rename from tests/data/db/revprops/0/2
rename to tests/data/repo/db/revprops/0/2
diff --git a/tests/data/db/revprops/0/3 b/tests/data/repo/db/revprops/0/3
similarity index 100%
rename from tests/data/db/revprops/0/3
rename to tests/data/repo/db/revprops/0/3
diff --git a/tests/data/db/revprops/0/4 b/tests/data/repo/db/revprops/0/4
similarity index 100%
rename from tests/data/db/revprops/0/4
rename to tests/data/repo/db/revprops/0/4
diff --git a/tests/data/db/revprops/0/5 b/tests/data/repo/db/revprops/0/5
similarity index 100%
rename from tests/data/db/revprops/0/5
rename to tests/data/repo/db/revprops/0/5
diff --git a/tests/data/db/revs/0/0 b/tests/data/repo/db/revs/0/0
similarity index 100%
rename from tests/data/db/revs/0/0
rename to tests/data/repo/db/revs/0/0
diff --git a/tests/data/db/revs/0/1 b/tests/data/repo/db/revs/0/1
similarity index 100%
rename from tests/data/db/revs/0/1
rename to tests/data/repo/db/revs/0/1
diff --git a/tests/data/db/revs/0/2 b/tests/data/repo/db/revs/0/2
similarity index 100%
rename from tests/data/db/revs/0/2
rename to tests/data/repo/db/revs/0/2
diff --git a/tests/data/db/revs/0/3 b/tests/data/repo/db/revs/0/3
similarity index 100%
rename from tests/data/db/revs/0/3
rename to tests/data/repo/db/revs/0/3
diff --git a/tests/data/db/revs/0/4 b/tests/data/repo/db/revs/0/4
similarity index 100%
rename from tests/data/db/revs/0/4
rename to tests/data/repo/db/revs/0/4
diff --git a/tests/data/db/revs/0/5 b/tests/data/repo/db/revs/0/5
similarity index 100%
rename from tests/data/db/revs/0/5
rename to tests/data/repo/db/revs/0/5
diff --git a/tests/data/db/txn-current b/tests/data/repo/db/txn-current
similarity index 100%
rename from tests/data/db/txn-current
rename to tests/data/repo/db/txn-current
diff --git a/tests/data/db/txn-current-lock b/tests/data/repo/db/txn-current-lock
similarity index 100%
rename from tests/data/db/txn-current-lock
rename to tests/data/repo/db/txn-current-lock
diff --git a/tests/data/db/uuid b/tests/data/repo/db/uuid
similarity index 100%
rename from tests/data/db/uuid
rename to tests/data/repo/db/uuid
diff --git a/tests/data/db/write-lock b/tests/data/repo/db/write-lock
similarity index 100%
rename from tests/data/db/write-lock
rename to tests/data/repo/db/write-lock
diff --git a/tests/data/format b/tests/data/repo/format
similarity index 100%
rename from tests/data/format
rename to tests/data/repo/format
diff --git a/tests/data/locks/db-logs.lock b/tests/data/repo/locks/db-logs.lock
similarity index 100%
rename from tests/data/locks/db-logs.lock
rename to tests/data/repo/locks/db-logs.lock
diff --git a/tests/data/locks/db.lock b/tests/data/repo/locks/db.lock
similarity index 100%
rename from tests/data/locks/db.lock
rename to tests/data/repo/locks/db.lock
diff --git a/tests/repository/version_tests.php b/tests/repository/version_tests.php
index 3ff5b1f..f12e809 100644
--- a/tests/repository/version_tests.php
+++ b/tests/repository/version_tests.php
@@ -49,7 +49,7 @@ public static function suite()
 
     public function testVersionAuthor()
     {
-        $repo = new pchRepositoryVersion( __DIR__ . '/../data/', 1 );
+        $repo = new pchRepositoryVersion( __DIR__ . '/../data/repo/', 1 );
         $this->assertEquals(
             'kore',
             $repo->author
@@ -58,7 +58,7 @@ public function testVersionAuthor()
 
     public function testVersionDate()
     {
-        $repo = new pchRepositoryVersion( __DIR__ . '/../data/', 1 );
+        $repo = new pchRepositoryVersion( __DIR__ . '/../data/repo/', 1 );
         $this->assertEquals(
             '2009-09-15 20:03:23 +0200 (Tue, 15 Sep 2009)',
             $repo->date
@@ -67,7 +67,7 @@ public function testVersionDate()
 
     public function testVersionLog()
     {
-        $repo = new pchRepositoryVersion( __DIR__ . '/../data/', 1 );
+        $repo = new pchRepositoryVersion( __DIR__ . '/../data/repo/', 1 );
         $this->assertEquals(
             '- Added: A single test file to the test repository',
             $repo->log
diff --git a/tests/svn_keywords/check_tests.php b/tests/svn_keywords/check_tests.php
index 207f8c6..8dfd765 100644
--- a/tests/svn_keywords/check_tests.php
+++ b/tests/svn_keywords/check_tests.php
@@ -55,7 +55,7 @@ public function testInvalidSvnKeywords()
             array(
                 new pchIssue( E_WARNING, 'dir/errneous_file.php', null, 'Missing value \'Revision\' for property \'svn:keywords\'.' ),
             ),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 2 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 2 ) )
         );
     }
 
@@ -65,7 +65,7 @@ public function testNoSvnKeywords()
 
         $this->assertEquals(
             array(),
-            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/', 3 ) )
+            $parser->validate( new pchRepositoryVersion( __DIR__ . '/../data/repo/', 3 ) )
         );
     }
 }