diff --git a/test/unit/filesystem_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
similarity index 95%
rename from test/unit/filesystem_adapter_test.rb
rename to test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
index 26e97bda6..6e3b4cbb7 100644
--- a/test/unit/filesystem_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
@@ -1,5 +1,5 @@
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../../../test_helper'
 
 
 class FilesystemAdapterTest < ActiveSupport::TestCase
diff --git a/test/unit/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
similarity index 95%
rename from test/unit/git_adapter_test.rb
rename to test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
index 8bc000c4c..e3c633749 100644
--- a/test/unit/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../../../test_helper'
 
 class GitAdapterTest < ActiveSupport::TestCase
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
diff --git a/test/unit/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
similarity index 96%
rename from test/unit/mercurial_adapter_test.rb
rename to test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
index f7b0d3c5b..7396a3957 100644
--- a/test/unit/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../../../test_helper'
 begin
   require 'mocha'
   
diff --git a/test/unit/subversion_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
similarity index 94%
rename from test/unit/subversion_adapter_test.rb
rename to test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
index ddef52df2..e44d12f2d 100644
--- a/test/unit/subversion_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
@@ -17,7 +17,7 @@
 
 require 'mkmf'
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/../../../../../test_helper'
 
 class SubversionAdapterTest < ActiveSupport::TestCase