diff --git a/spec/controllers/split_checkout_controller_spec.rb b/spec/controllers/split_checkout_controller_spec.rb
index 114a947c39..7783717e28 100644
--- a/spec/controllers/split_checkout_controller_spec.rb
+++ b/spec/controllers/split_checkout_controller_spec.rb
@@ -233,73 +233,6 @@ describe SplitCheckoutController, type: :controller do
           expect(order.payments.first.source.id).to eq saved_card.id
         end
       end
-
-      describe "Vouchers" do
-        let(:voucher) { create(:voucher, code: 'some_code', enterprise: distributor) }
-
-        describe "adding a voucher" do
-          let(:checkout_params) do
-            {
-              apply_voucher: "true",
-              order: {
-                voucher_code: voucher.code
-              }
-            }
-          end
-
-          it "adds a voucher to the order" do
-            # Set the headers to simulate a cable_ready request
-            request.headers["accept"] = "text/vnd.cable-ready.json"
-
-            put :update, params: params
-
-            expect(response.status).to eq(200)
-            expect(order.reload.voucher_adjustments.length).to eq(1)
-          end
-
-          context "when voucher doesn't exist" do
-            let(:checkout_params) do
-              {
-                apply_voucher: "true",
-                order: {
-                  voucher_code: "non_voucher"
-                }
-              }
-            end
-
-            it "returns 422 and an error message" do
-              put :update, params: params
-
-              expect(response.status).to eq 422
-              expect(flash[:error]).to match "Voucher Not found"
-            end
-          end
-
-          context "when adding fails" do
-            it "returns 422 and an error message" do
-              # Create a non valid adjustment
-              adjustment = build(:adjustment, label: nil)
-              allow(voucher).to receive(:create_adjustment).and_return(adjustment)
-              allow(Voucher).to receive(:find_by).and_return(voucher)
-
-              put :update, params: params
-
-              expect(response.status).to eq 422
-              expect(flash[:error]).to match(
-                "There was an error while adding the voucher and Label can't be blank"
-              )
-            end
-          end
-
-          context "with an html request" do
-            it "redirects to the payment step" do
-              put :update, params: params
-
-              expect(response).to redirect_to(checkout_step_path(:payment))
-            end
-          end
-        end
-      end
     end
 
     context "summary step" do
diff --git a/spec/controllers/voucher_adjustments_controller_spec.rb b/spec/controllers/voucher_adjustments_controller_spec.rb
new file mode 100644
index 0000000000..d9366dae17
--- /dev/null
+++ b/spec/controllers/voucher_adjustments_controller_spec.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe VoucherAdjustmentsController, type: :controller do
+  let(:user) { order.user }
+  let(:address) { create(:address) }
+  let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }
+  let(:order_cycle) { create(:order_cycle, distributors: [distributor]) }
+  let(:exchange) { order_cycle.exchanges.outgoing.first }
+  let(:order) {
+    create(:order_with_line_items, line_items_count: 1, distributor: distributor,
+                                   order_cycle: order_cycle, bill_address: address,
+                                   ship_address: address)
+  }
+  let(:payment_method) { distributor.payment_methods.first }
+  let(:shipping_method) { distributor.shipping_methods.first }
+
+  let(:voucher) { create(:voucher, code: 'some_code', enterprise: distributor) }
+
+  before do
+    exchange.variants << order.line_items.first.variant
+    order.select_shipping_method shipping_method.id
+    OrderWorkflow.new(order).advance_to_payment
+
+    allow(controller).to receive(:current_order) { order }
+    allow(controller).to receive(:spree_current_user) { user }
+  end
+
+  describe "#create" do
+    describe "adding a voucher" do
+      let(:params) { { voucher_code: voucher.code } }
+
+      it "adds a voucher to the user's current order" do
+        post :create, params: params
+
+        expect(response.status).to eq(200)
+        expect(order.reload.voucher_adjustments.length).to eq(1)
+      end
+
+      context "when voucher doesn't exist" do
+        let(:params) { { voucher_code: "non_voucher" } }
+
+        it "returns 422 and an error message" do
+          post :create, params: params
+
+          expect(response.status).to eq 422
+          expect(flash[:error]).to match "Voucher Not found"
+        end
+      end
+
+      context "when adding fails" do
+        it "returns 422 and an error message" do
+          # Create a non valid adjustment
+          adjustment = build(:adjustment, label: nil)
+          allow(voucher).to receive(:create_adjustment).and_return(adjustment)
+          allow(Voucher).to receive(:find_by).and_return(voucher)
+
+          post :create, params: params
+
+          expect(response.status).to eq 422
+          expect(flash[:error]).to match(
+            "There was an error while adding the voucher and Label can't be blank"
+          )
+        end
+      end
+    end
+  end
+
+  describe "#destroy" do
+    it "removes the voucher from the current order" do
+      put :destroy, params: { id: voucher.id }
+
+      expect(order.reload.voucher_adjustments.count).to eq 0
+      expect(response.status).to eq 200
+    end
+  end
+end