diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb
index f51de02e5f..7626329ef2 100644
--- a/spec/features/admin/subscriptions_spec.rb
+++ b/spec/features/admin/subscriptions_spec.rb
@@ -454,9 +454,7 @@ feature 'Subscriptions' do
         select2_select payment_method.name, from: "payment_method_id"
         select2_select shipping_method.name, from: "shipping_method_id"
         find_field("begins_at").click
-        within(".ui-datepicker-calendar") do
-          find(".ui-datepicker-today").click
-        end
+        choose_today_from_datepicker
         click_button "Next"
 
         expect(page).to have_content "BILLING ADDRESS"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 25dac67716..f404f4c95a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -136,6 +136,7 @@ RSpec.configure do |config|
   config.extend  Spree::Api::TestingSupport::Setup, :type => :controller
   config.include Spree::Api::TestingSupport::Helpers, :type => :controller
   config.include OpenFoodNetwork::ControllerHelper, :type => :controller
+  config.include Features::DatepickerHelper, type: :feature
   config.include OpenFoodNetwork::FeatureToggleHelper
   config.include OpenFoodNetwork::FiltersHelper
   config.include OpenFoodNetwork::EnterpriseGroupsHelper
diff --git a/spec/support/features/datepicker_helper.rb b/spec/support/features/datepicker_helper.rb
new file mode 100644
index 0000000000..df966cfa05
--- /dev/null
+++ b/spec/support/features/datepicker_helper.rb
@@ -0,0 +1,9 @@
+module Features
+  module DatepickerHelper
+    def choose_today_from_datepicker
+      within(".ui-datepicker-calendar") do
+        find(".ui-datepicker-today").click
+      end
+    end
+  end
+end