diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1ba032d..998581b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,8 +2,8 @@ ENV["RAILS_ENV"] = "test"
 
 # Start/stop Solr
 if not $test_helper_loaded
-	abort unless system 'rake solr:start'
-  at_exit { system 'rake solr:stop' }
+	abort unless system 'rake -s solr:start'
+  at_exit { system 'rake -s solr:stop' }
   $test_helper_loaded = true
 end
 
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 03de207..e2a7705 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -1218,10 +1218,10 @@ class ProfileTest < ActiveSupport::TestCase
   end
 
   should 'be possible to have different profiles with the same identifier in different environments' do
-    p1 = fast_create(Profile, :identifier => 'mytestprofile')
-
-    env = fast_create(Environment)
-    p2 = create(Profile, :identifier => 'mytestprofile', :environment => env)
+    env1 = fast_create(Environment)
+    p1 = create(Profile, :identifier => 'mytestprofile', :environment => env1)
+    env2 = fast_create(Environment)
+    p2 = create(Profile, :identifier => 'mytestprofile', :environment => env2)
 
     assert_not_equal p1.environment, p2.environment
   end
--
libgit2 0.21.2