diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index 1f5ae74dbb18e13a068202c3f182a0439a3bfcb4..1941392ac6671d78b496b6f4d52a47975db93281 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -51,7 +51,7 @@
 
           <ul class="dropdown-menu dropdown-menu-align-right">
             <li v-for="action in actions">
-              <a :href="action.play_url" data-method="post" rel="nofollow">
+              <a :href="action.play_url" data-method="post" data-rel="nofollow" class="js-manual-action-link">
               <span class="action-play-icon-container">
                 <!-- svg goes here -->
               </span>
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index fe5a783a386b95cda8f1148d3aabd643e867ca0a..a92282832722a5b7480f8b9cd6ff0e762e1160b0 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -75,14 +75,12 @@ feature 'Environments', feature: true, js: true do
 
           scenario 'does show a play button' do
             # TODO: Fix me!
-            binding.pry
-            expect(page).to have_link(manual.name.humanize)
+            expect(page).to have_content(manual.name.humanize)
           end
 
           scenario 'does allow to play manual action' do
             expect(manual).to be_skipped
             # TODO: Fix me!
-            binding.pry
             expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count }
             expect(page).to have_content(manual.name)
             expect(manual.reload).to be_pending
diff --git a/spec/javascripts/environments/environment_stop_spec.js.es6 b/spec/javascripts/environments/environment_stop_spec.js.es6
index 07a68bf28fb526f41aa86d94fdb3c3e5dce03207..20eb8c9232291092a87d1a488575db2c3066b3e0 100644
--- a/spec/javascripts/environments/environment_stop_spec.js.es6
+++ b/spec/javascripts/environments/environment_stop_spec.js.es6
@@ -14,7 +14,7 @@ describe('Stop Component', () => {
         stop_url: stopURL,
       },
     });
-    expect(component.$el.getAttribute('href')).toEqual(stopURL);
+    expect(component.$el.getAttribute('href')).toEqual(`${stopURL}/stop`);
   });
 
   describe('When clicked', () => {