diff --git a/spec/system/admin/orders_spec.rb b/spec/system/admin/orders_spec.rb
index b98cabf2df..3c64764c46 100644
--- a/spec/system/admin/orders_spec.rb
+++ b/spec/system/admin/orders_spec.rb
@@ -242,7 +242,7 @@ describe '
           end
 
           it "orders alphabetically by order number" do
-            find("a", text: 'NUMBER').click
+            find("a", text: 'NUMBER').click # sets ascending ordering
             expect(page).to have_content "Loading"
             expect(page).to have_content(/#{order5.number}.*#{order4.number}.*#{order3.number}.*#{order2.number}/m)
             find("a", text: 'NUMBER').click # sets descending ordering
@@ -263,7 +263,7 @@ describe '
           end
 
           it "orders alphabetically by order number" do
-            find("a", text: 'STATE').click
+            find("a", text: 'STATE').click # sets ascending ordering
             expect(page).to have_content "Loading"
             expect(page).to have_content(/#{order5.number}.*#{order4.number}.*#{order3.number}.*#{order2.number}/m)
             find("a", text: 'STATE').click # sets descending ordering
@@ -271,6 +271,25 @@ describe '
             expect(page).to have_content(/#{order2.number}.*#{order3.number}.*#{order4.number}.*#{order5.number}/m)
           end
         end
+
+        context "orders by payment state" do
+          before do
+            Spree::Payment.where(order_id: order2.id).update(amount: 50.0)
+            Spree::Payment.where(order_id: order3.id).update(amount: 100.0)
+            Spree::Payment.where(order_id: order4.id).update(amount: 10.0)
+            order5.update(state: "cart") # hides order 5
+            login_as_admin_and_visit spree.admin_orders_path
+          end
+
+          it "orders alphabetically by order number" do
+            find("a", text: 'PAYMENT STATE').click # sets ascending ordering
+            expect(page).to have_content "Loading"
+            expect(page).to have_content(/#{order4.number}.*#{order3.number}.*#{order2.number}/m)
+            find("a", text: 'PAYMENT STATE').click # sets descending ordering
+            expect(page).to have_content "Loading"
+            expect(page).to have_content(/#{order2.number}.*#{order3.number}.*#{order4.number}/m)
+          end
+        end
       end
     end