diff --git a/test/fixtures.yml b/test/files/fixtures.yml
similarity index 100%
rename from test/fixtures.yml
rename to test/files/fixtures.yml
diff --git a/test/test_import.csv b/test/files/test_import.csv
similarity index 100%
rename from test/test_import.csv
rename to test/files/test_import.csv
diff --git a/test/test_import.yml b/test/files/test_import.yml
similarity index 100%
rename from test/test_import.yml
rename to test/files/test_import.yml
diff --git a/test/test_mpw.rb b/test/test_mpw.rb
index 46760db..1874cb6 100644
--- a/test/test_mpw.rb
+++ b/test/test_mpw.rb
@@ -8,7 +8,7 @@ require 'csv'
 class TestMPW < Test::Unit::TestCase
 
 	def setup
-		@fixture_file = 'fixtures.yml'
+		@fixture_file = 'files/fixtures.yml'
 
 		file_gpg = 'test.gpg'
 		key      = 'test-mpw@test-mpw.local'
@@ -28,7 +28,7 @@ class TestMPW < Test::Unit::TestCase
 	end
  
  	def test_import_yaml
-		import_file = 'test_import.yml'
+		import_file = 'files/test_import.yml'
 
 		assert(@mpw.import(import_file, :yaml))
 		assert_equal(2, @mpw.search.length)
@@ -67,7 +67,7 @@ class TestMPW < Test::Unit::TestCase
 	end
 
 	def test_import_csv
-		import_file = 'test_import.csv'
+		import_file = 'files/test_import.csv'
 
 		assert(@mpw.import(import_file, :csv))
 		assert_equal(2, @mpw.search.length)