diff --git a/spec/components/custom_wizard/subscription_spec.rb b/spec/components/custom_wizard/subscription_spec.rb
index 0bfb1839..2db8dae0 100644
--- a/spec/components/custom_wizard/subscription_spec.rb
+++ b/spec/components/custom_wizard/subscription_spec.rb
@@ -13,15 +13,6 @@ describe CustomWizard::Subscription do
     }
   }
 
-  def undefine_client_classes
-    Object.send(:remove_const, :SubscriptionClient) if Object.constants.include?(:SubscriptionClient)
-    Object.send(:remove_const, :SubscriptionClientSubscription) if Object.constants.include?(:SubscriptionClientSubscription)
-  end
-
-  def define_client_classes
-    load File.expand_path("#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/subscription_client.rb", __FILE__)
-  end
-
   after do
     undefine_client_classes
   end
diff --git a/spec/plugin_helper.rb b/spec/plugin_helper.rb
index 16585e16..8436f7c9 100644
--- a/spec/plugin_helper.rb
+++ b/spec/plugin_helper.rb
@@ -23,3 +23,12 @@ def disable_subscriptions
     CustomWizard::Subscription.any_instance.stubs("#{type}?".to_sym).returns(false)
   end
 end
+
+def undefine_client_classes
+  Object.send(:remove_const, :SubscriptionClient) if Object.constants.include?(:SubscriptionClient)
+  Object.send(:remove_const, :SubscriptionClientSubscription) if Object.constants.include?(:SubscriptionClientSubscription)
+end
+
+def define_client_classes
+  load File.expand_path("#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/subscription_client.rb", __FILE__)
+end
diff --git a/spec/requests/custom_wizard/admin/admin_controller_spec.rb b/spec/requests/custom_wizard/admin/admin_controller_spec.rb
index 5e2b722c..877f4262 100644
--- a/spec/requests/custom_wizard/admin/admin_controller_spec.rb
+++ b/spec/requests/custom_wizard/admin/admin_controller_spec.rb
@@ -16,20 +16,21 @@ describe CustomWizard::AdminController do
     context "without a subscription" do
       before do
         disable_subscriptions
+        define_client_classes
       end
 
       it "returns the right subscription details" do
         get "/admin/wizards.json"
         expect(response.parsed_body["subscribed"]).to eq(false)
         expect(response.parsed_body["subscription_attributes"]).to eq(CustomWizard::Subscription.attributes.as_json)
-        expect(response.parsed_body["subscription_client_installed"]).to eq(false)
+        expect(response.parsed_body["subscription_client_installed"]).to eq(true)
       end
     end
 
     context "with a subscription" do
       before do
         enable_subscription("standard")
-        load File.expand_path("#{Rails.root}/plugins/discourse-custom-wizard/spec/fixtures/subscription_client.rb", __FILE__)
+        define_client_classes
       end
 
       it "returns the right subscription details" do