diff --git a/features/oauth.feature b/features/oauth.feature
index 754dc0ab6..12adecd2b 100644
--- a/features/oauth.feature
+++ b/features/oauth.feature
@@ -1,4 +1,4 @@
-@javascript @no-ci
+@javascript @oauth-group
 Feature: oauth
   Exchanging oauth credentials
 
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 956b74daa..dc7d93ca4 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -8,7 +8,7 @@ namespace :ci do
       raise "Cucumber failed!" unless $?.exitstatus == 0
     elsif ENV['BUILD_TYPE'] == 'oauth-cucumber'
       puts "Running oauth cucumber features..."
-      system("export DISPLAY=:99.0 && CI=true bundle exec rake cucumber")
+      system("export DISPLAY=:99.0 && GROUP=oauth bundle exec rake cucumber")
       raise "OAuth cucumber failed!" unless $?.exitstatus == 0
     else
       ["rspec spec", "rake jasmine:ci"].each do |cmd|
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 450dac4f0..0f7829077 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -19,8 +19,8 @@ begin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
       cucumber_opts = ""
-      cucumber_opts << " -f pretty" unless ENV["CI"] || ENV["TRAVIS"]
-      cucumber_opts << " --tags ~@no-ci" if ENV["CI"] || ENV["TRAVIS"]
+      cucumber_opts << " -f pretty" unless ENV["TRAVIS"]
+      cucumber_opts << ((ENV["GROUP"] == "oauth") ? " --tags @oauth-group" : " --tags ~@oauth-group")
       t.cucumber_opts =  cucumber_opts
     end