1 files changed, 2 insertions, 13 deletions
diff --git a/qa/qa/specs/features/mattermost/login_spec.rb b/qa/qa/specs/features/mattermost/login_spec.rb
index 4b3987efcb3..637bbdd643a 100644
--- a/qa/qa/specs/features/mattermost/login_spec.rb
+++ b/qa/qa/specs/features/mattermost/login_spec.rb
@@ -1,10 +1,10 @@
 module QA
   feature 'logging in to Mattermost', :mattermost do
     scenario 'can use gitlab oauth' do
-      Runtime::Browser.visit(Page::Main::Login) do
+      Runtime::Browser.visit(:gitlab, Page::Main::Login) do
         Page::Main::Login.act { sign_in_using_credentials }
 
-        Runtime::Browser.visit(Page::Mattermost::Login) do
+        Runtime::Browser.visit(:mattermost, Page::Mattermost::Login) do
           Page::Mattermost::Login.act { sign_in_using_oauth }
 
           Page::Mattermost::Main.perform do |page|
@@ -13,16 +13,5 @@ module QA
         end
       end
     end
-
-    ##
-    # TODO, temporary workaround for gitlab-org/gitlab-qa#102.
-    #
-    after do
-      visit Runtime::Scenario.mattermost_address
-      reset_session!
-
-      visit Runtime::Scenario.gitlab_address
-      reset_session!
-    end
   end
 end