diff --git a/app/constraints/feature_toggle_constraint.rb b/app/constraints/feature_toggle_constraint.rb
index cd7070eed8..cae850574d 100644
--- a/app/constraints/feature_toggle_constraint.rb
+++ b/app/constraints/feature_toggle_constraint.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "open_food_network/feature_toggle"
+
 class FeatureToggleConstraint
   def initialize(feature_name)
     @feature = feature_name
@@ -10,6 +12,6 @@ class FeatureToggleConstraint
   end
 
   def current_user(request)
-    request.env['warden'].user
+    request.env['warden']&.user
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index cf7e544f5a..9c449ed11d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -117,7 +117,7 @@ Openfoodnetwork::Application.routes.draw do
 
   get 'sitemap.xml', to: 'sitemap#index', defaults: { format: 'xml' }
 
-  unless Rails.env.production?
+  constraints FeatureToggleConstraint.new(:dfc_provider) do
     # Mount DFC API endpoints
     mount DfcProvider::Engine, at: '/'
   end
diff --git a/spec/base_spec_helper.rb b/spec/base_spec_helper.rb
index 890561b4d6..008445dd72 100644
--- a/spec/base_spec_helper.rb
+++ b/spec/base_spec_helper.rb
@@ -129,7 +129,6 @@ RSpec.configure do |config|
   config.include Spree::UrlHelpers
   config.include Spree::MoneyHelper
   config.include PreferencesHelper
-  config.include OpenFoodNetwork::FeatureToggleHelper
   config.include OpenFoodNetwork::FiltersHelper
   config.include OpenFoodNetwork::EnterpriseGroupsHelper
   config.include OpenFoodNetwork::ProductsHelper
diff --git a/spec/controllers/payment_gateways/stripe_controller_spec.rb b/spec/controllers/payment_gateways/stripe_controller_spec.rb
index 60f95abd39..3644ccb70a 100644
--- a/spec/controllers/payment_gateways/stripe_controller_spec.rb
+++ b/spec/controllers/payment_gateways/stripe_controller_spec.rb
@@ -88,10 +88,7 @@ module PaymentGateways
 
         context "using split checkout" do
           before do
-            allow(OpenFoodNetwork::FeatureToggle).
-              to receive(:enabled?).with(:split_checkout) { true }
-            allow(OpenFoodNetwork::FeatureToggle).
-              to receive(:enabled?).with(:split_checkout, anything) { true }
+            Flipper.enable(:split_checkout)
 
             order.update_attribute :state, "confirmation"
           end
diff --git a/spec/controllers/split_checkout_controller_spec.rb b/spec/controllers/split_checkout_controller_spec.rb
index 1b3e71c73a..40c1f0b354 100644
--- a/spec/controllers/split_checkout_controller_spec.rb
+++ b/spec/controllers/split_checkout_controller_spec.rb
@@ -16,10 +16,7 @@ describe SplitCheckoutController, type: :controller do
   let(:shipping_method) { distributor.shipping_methods.first }
 
   before do
-    allow(OpenFoodNetwork::FeatureToggle).
-      to receive(:enabled?).with(:split_checkout) { true }
-    allow(OpenFoodNetwork::FeatureToggle).
-      to receive(:enabled?).with(:split_checkout, anything) { true }
+    Flipper.enable(:split_checkout)
 
     exchange.variants << order.line_items.first.variant
     allow(controller).to receive(:current_order) { order }
diff --git a/spec/routing/stripe_spec.rb b/spec/routing/stripe_spec.rb
index 54dd76bde2..9ce5ce8c6c 100644
--- a/spec/routing/stripe_spec.rb
+++ b/spec/routing/stripe_spec.rb
@@ -3,10 +3,6 @@
 require "spec_helper"
 
 describe "routing for Stripe return URLS", type: :routing do
-  before do
-    allow_any_instance_of(FeatureToggleConstraint).to receive(:current_user) { build(:user) }
-  end
-
   context "checkout return URLs" do
     it "routes /checkout to checkout#edit" do
       expect(get: "checkout").
diff --git a/spec/support/feature_toggle_helper.rb b/spec/support/feature_toggle_helper.rb
deleted file mode 100644
index a817e25049..0000000000
--- a/spec/support/feature_toggle_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module OpenFoodNetwork
-  module FeatureToggleHelper
-    def set_feature_toggle(feature, status)
-      features = OpenFoodNetwork::FeatureToggle.features
-      features[feature] = status
-      allow(OpenFoodNetwork::FeatureToggle).to receive(:features) { features }
-    end
-  end
-end
diff --git a/spec/system/consumer/shopping/checkout_auth_spec.rb b/spec/system/consumer/shopping/checkout_auth_spec.rb
index 389c5a4eaf..d9aa53581a 100644
--- a/spec/system/consumer/shopping/checkout_auth_spec.rb
+++ b/spec/system/consumer/shopping/checkout_auth_spec.rb
@@ -83,8 +83,7 @@ describe "As a consumer I want to check out my cart", js: true do
 
       context "split checkout" do
         before do
-          allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout) { true }
-          allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout, anything) { true }
+          Flipper.enable(:split_checkout)
         end
         include_examples "with different checkout types", "split_checkout"
       end
diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb
index 071fccc627..a02cc246cc 100644
--- a/spec/system/consumer/split_checkout_spec.rb
+++ b/spec/system/consumer/split_checkout_spec.rb
@@ -65,8 +65,7 @@ describe "As a consumer, I want to checkout my order", js: true do
   }
 
   before do
-    allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout).and_return(true)
-    allow(OpenFoodNetwork::FeatureToggle).to receive(:enabled?).with(:split_checkout, anything).and_return(true)
+    Flipper.enable(:split_checkout)
 
     add_enterprise_fee enterprise_fee
     set_order order
diff --git a/spec/system/consumer/split_checkout_tax_incl_spec.rb b/spec/system/consumer/split_checkout_tax_incl_spec.rb
index 96199c4a2a..146104e824 100644
--- a/spec/system/consumer/split_checkout_tax_incl_spec.rb
+++ b/spec/system/consumer/split_checkout_tax_incl_spec.rb
@@ -111,10 +111,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
 
       context "on split-checkout" do
         before do
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout).and_return(true)
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout, anything).and_return(true)
+          Flipper.enable(:split_checkout)
 
           set_order order_within_zone
           login_as(user_within_zone)
@@ -171,10 +168,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
 
       context "on split-checkout" do
         before do
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout).and_return(true)
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout, anything).and_return(true)
+          Flipper.enable(:split_checkout)
 
           set_order order_outside_zone
           login_as(user_outside_zone)
diff --git a/spec/system/consumer/split_checkout_tax_not_incl_spec.rb b/spec/system/consumer/split_checkout_tax_not_incl_spec.rb
index ac376980a7..340063c0fd 100644
--- a/spec/system/consumer/split_checkout_tax_not_incl_spec.rb
+++ b/spec/system/consumer/split_checkout_tax_not_incl_spec.rb
@@ -118,10 +118,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
 
       context "on split-checkout" do
         before do
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout).and_return(true)
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout, anything).and_return(true)
+          Flipper.enable(:split_checkout)
 
           set_order order_within_zone
           login_as(user_within_zone)
@@ -181,10 +178,7 @@ describe "As a consumer, I want to see adjustment breakdown" do
 
       context "on split-checkout" do
         before do
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout).and_return(true)
-          allow(OpenFoodNetwork::FeatureToggle).
-            to receive(:enabled?).with(:split_checkout, anything).and_return(true)
+          Flipper.enable(:split_checkout)
 
           set_order order_outside_zone
           login_as(user_outside_zone)