diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index ccb29293a89eb5d1fd7b4e189923ca15b4381005..ec2aff4377d386a794ff1fc431ee28027f4bec51 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -24,7 +24,7 @@ Feature: Project Source Browse Files
     Given I click on "new file" link in repo
     Then I can see new file page
 
-  @javascript
+  @javascript @tricky
   Scenario: I can create and commit file
     Given I click on "new file" link in repo
     And I edit code
diff --git a/lib/tasks/spinach.rake b/lib/tasks/spinach.rake
index 507b315759d2557c83f2a33181d62939f0967f3a..ac885f315b9e283b0b3c1eee9d34c47e825790c4 100644
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
@@ -2,9 +2,15 @@ Rake::Task["spinach"].clear if Rake::Task.task_defined?('spinach')
 
 desc "GITLAB | Run spinach"
 task :spinach do
+  tags = if ENV['SEMAPHORE']
+           '~@tricky,~@wip'
+         else
+           '~@wip'
+         end
+
   cmds = [
     %W(rake gitlab:setup),
-    %W(spinach),
+    %W(spinach --tags #{tags}),
   ]
   run_commands(cmds)
 end