diff --git a/lib/redmine_dmsf/test/integration_test.rb b/test/integration_test.rb
similarity index 94%
rename from lib/redmine_dmsf/test/integration_test.rb
rename to test/integration_test.rb
index b933df66..cd783f72 100644
--- a/lib/redmine_dmsf/test/integration_test.rb
+++ b/test/integration_test.rb
@@ -23,7 +23,7 @@ module RedmineDmsf
   module Test
     class IntegrationTest < Redmine::IntegrationTest
       def self.fixtures(*table_names)
-        dir = File.join( File.dirname(__FILE__), '../../../test/fixtures')
+        dir = File.join( File.dirname(__FILE__), '/fixtures')
         table_names.each do |x|          
           ActiveRecord::FixtureSet.create_fixtures(dir, x) if File.exist?("#{dir}/#{x}.yml")
         end
diff --git a/lib/redmine_dmsf/test/test_case.rb b/test/test_case.rb
similarity index 96%
rename from lib/redmine_dmsf/test/test_case.rb
rename to test/test_case.rb
index 85b1cd56..bf77cd2e 100644
--- a/lib/redmine_dmsf/test/test_case.rb
+++ b/test/test_case.rb
@@ -28,7 +28,7 @@ module RedmineDmsf
       # Ultimately it allows for better integration without blowing redmine fixtures up,
       # and allowing us to suppliment redmine fixtures if we need to.
       def self.fixtures(*table_names)
-        dir = File.join( File.dirname(__FILE__), '../../../test/fixtures')
+        dir = File.join( File.dirname(__FILE__), '/fixtures')
         table_names.each do |x|
           ActiveRecord::FixtureSet.create_fixtures(dir, x) if File.exist?("#{dir}/#{x}.yml")
         end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 339ba58f..24449f80 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -21,4 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 # Load the normal Rails helper
-require File.expand_path('../../../../test/test_helper', __FILE__)
\ No newline at end of file
+require File.expand_path('../../../../test/test_helper', __FILE__)
+
+require_relative 'test_case'
+require_relative 'integration_test'
+require_relative 'unit_test'
\ No newline at end of file
diff --git a/lib/redmine_dmsf/test/unit_test.rb b/test/unit_test.rb
similarity index 95%
rename from lib/redmine_dmsf/test/unit_test.rb
rename to test/unit_test.rb
index 5d98cd48..2c1fbebb 100644
--- a/lib/redmine_dmsf/test/unit_test.rb
+++ b/test/unit_test.rb
@@ -28,7 +28,7 @@ module RedmineDmsf
       # Ultimately it allows for better integration without blowing redmine fixtures up,
       # and allowing us to suppliment redmine fixtures if we need to.
       def self.fixtures(*table_names)
-        dir = File.join( File.dirname(__FILE__), '../../../test/fixtures')
+        dir = File.join( File.dirname(__FILE__), '/fixtures')
         table_names.each do |x|
           ActiveRecord::FixtureSet.create_fixtures(dir, x) if File.exist?("#{dir}/#{x}.yml")
         end