diff --git a/spec/lib/shell_spec.rb b/spec/lib/gitlab/backend/shell_spec.rb
similarity index 100%
rename from spec/lib/shell_spec.rb
rename to spec/lib/gitlab/backend/shell_spec.rb
diff --git a/spec/lib/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
similarity index 77%
rename from spec/lib/git/commit_spec.rb
rename to spec/lib/gitlab/git/commit_spec.rb
index 5f3297eea17b594a4725736eb0a27c52c39dd071..bf2cd98eba14fac175a1301c4e6924ed8bbfd03e 100644
--- a/spec/lib/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -37,15 +37,4 @@ describe Gitlab::Git::Commit do
     it { @commit.committer_email.should == @committer.email }
     it { @commit.different_committer?.should be_true }
   end
-
-  describe "Class methods" do
-    subject { Gitlab::Git::Commit }
-
-    it { should respond_to(:find_or_first) }
-    it { should respond_to(:fresh_commits) }
-    it { should respond_to(:commits_with_refs) }
-    it { should respond_to(:commits_since) }
-    it { should respond_to(:commits_between) }
-    it { should respond_to(:commits) }
-  end
 end
diff --git a/spec/lib/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
similarity index 89%
rename from spec/lib/git/repository_spec.rb
rename to spec/lib/gitlab/git/repository_spec.rb
index b2b6f1964de6622bd630674849db53d5dee29f22..c68bdaaae00a0a8d792f9ff2220ce818c01b9f33 100644
--- a/spec/lib/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -14,8 +14,6 @@ describe Gitlab::Git::Repository do
     it { should respond_to(:commits) }
     it { should respond_to(:commits_between) }
     it { should respond_to(:commits_with_refs) }
-    it { should respond_to(:commits_since) }
-    it { should respond_to(:commits_between) }
   end
 
 
@@ -84,12 +82,6 @@ describe Gitlab::Git::Repository do
     end
   end
 
-  describe "fresh commits" do
-    it { repository.fresh_commits(3).count.should == 3 }
-    it { repository.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
-    it { repository.fresh_commits.last.id.should == "f403da73f5e62794a0447aca879360494b08f678" }
-  end
-
   describe "commits_between" do
     subject do
       commits = repository.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
diff --git a/spec/lib/popen_spec.rb b/spec/lib/gitlab/popen_spec.rb
similarity index 100%
rename from spec/lib/popen_spec.rb
rename to spec/lib/gitlab/popen_spec.rb