diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1ca532e7ebf6b9a9ef96291db59e9a1d24922ba..030a5e669f54b8ffa36659e3fc48c81ac50f236f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -521,8 +521,9 @@ rails-specs:
     GITALY_TEST: "true"
     FORCE_GITLAB_CI: "true"
   rules:
-    - when: manual
+    - if: '"$CI_MERGE_REQUEST_IID" != ""'
       allow_failure: true
+    - when: manual
 
 rails-specs-cleanup:
   stage: qa
@@ -534,9 +535,6 @@ rails-specs-cleanup:
   environment:
     name: merge-requests/$RAILS_BRANCH_FOR_JOB
     action: stop
-  rules:
-    - when: manual
-      allow_failure: true
 
 cleanup-rails-spec-test-env:
   needs: ["rails-specs-cleanup"]