diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68690ff33daea76c4d2d61d45975fad76b2d5f29..2dced4a335109257cba402b9b9bfb16e1f50da3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,11 +166,6 @@ spinach 9 10: *spinach-knapsack
 .ruby-21: &ruby-21
   image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1"
   <<: *use-db
-  only:
-    - master@gitlab-org/gitlab-ce
-    - master@gitlab-org/gitlab-ee
-    - master@gitlab/gitlabhq
-    - master@gitlab/gitlab-ee
   cache:
     key: "ruby21"
     paths:
diff --git a/spec/support/api_helpers.rb b/spec/support/api_helpers.rb
index 68b196d9033d14a359805b24de4ede8cd57a9b1c..e25cb9ecd892509fbf20a60b76fe49cb87653a6a 100644
--- a/spec/support/api_helpers.rb
+++ b/spec/support/api_helpers.rb
@@ -18,7 +18,7 @@ module ApiHelpers
   #
   # Returns the relative path to the requested API resource
   def api(path, user = nil)
-    "/api/#{API::API.version}#{path}" +
+    "/api/#{API::API.version}#{URI.escape(path)}" +
 
       # Normalize query string
       (path.index('?') ? '' : '?') +