1 files changed, 6 insertions, 3 deletions
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb
index 2bf159002a0..c7e8a39a617 100644
--- a/spec/support/gitaly.rb
+++ b/spec/support/gitaly.rb
@@ -1,7 +1,10 @@
-if Gitlab::GitalyClient.enabled?
-  RSpec.configure do |config|
-    config.before(:each) do |example|
+RSpec.configure do |config|
+  config.before(:each) do |example|
+    if example.metadata[:disable_gitaly]
+      allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
+    else
       next if example.metadata[:skip_gitaly_mock]
+
       allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true)
     end
   end