diff --git a/spec/support/request/web_helper.rb b/spec/support/request/web_helper.rb
index a5c4924a83..21f5159c07 100644
--- a/spec/support/request/web_helper.rb
+++ b/spec/support/request/web_helper.rb
@@ -88,6 +88,16 @@ module WebHelper
     find(:css, ".select2-result-label", text: options[:select_text] || value).click
   end
 
+  def clear_select2(selector)
+    page.find(selector).scroll_to(page.find(selector))
+      .find(:css, '.select2-choice, .select2-search-field').click
+    page.find(selector).scroll_to(page.find(selector))
+      .find(:css, '.select2-choice, .select2-search-field').send_keys :backspace
+    page.find(selector).scroll_to(page.find(selector))
+      .find(:css, '.select2-choice, .select2-search-field').send_keys :backspace
+    find("body").send_keys(:escape)
+  end
+
   def request_monitor_finished(controller = nil)
     page.evaluate_script("#{angular_scope(controller)}.scope().RequestMonitor.loading == false")
   end
diff --git a/spec/system/admin/reports/orders_and_distributors_spec.rb b/spec/system/admin/reports/orders_and_distributors_spec.rb
index 8c48350abb..ecacbeec15 100644
--- a/spec/system/admin/reports/orders_and_distributors_spec.rb
+++ b/spec/system/admin/reports/orders_and_distributors_spec.rb
@@ -18,83 +18,125 @@ RSpec.describe "Orders And Distributors" do
       create(:order_ready_to_ship, distributor_id: distributor2.id, completed_at:)
     }
 
-    let(:line_item1) {
-      [completed_at, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
-       "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check", "By Bike",
-       "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
-    }
-    let(:line_item2) {
-      [completed_at, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
-       "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check", "By Bike",
-       "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
-    }
-    let(:line_item3) {
-      [completed_at.to_s, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
-       "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check", "By Bike",
-       "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
-    }
-    let(:line_item4) {
-      [completed_at.to_s, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
-       "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check", "By Bike",
-       "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
-    }
-    let(:line_item5) {
-      [completed_at.to_s, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
-       "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check", "By Bike",
-       "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
-    }
+    context "as an enterprise user" do
+      let(:line_item1) {
+        [completed_at, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
+         "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check",
+         "By Bike", "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
+      }
+      let(:line_item2) {
+        [completed_at, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
+         "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check",
+         "By Bike", "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
+      }
+      let(:line_item3) {
+        [completed_at.to_s, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
+         "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check",
+         "By Bike", "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
+      }
+      let(:line_item4) {
+        [completed_at.to_s, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
+         "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check",
+         "By Bike", "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
+      }
+      let(:line_item5) {
+        [completed_at.to_s, order.id, "John Doe", order.email, "123-456-7890", "Herndon",
+         "ABC", Spree::Product.first.name.to_s, "1g", "1", "none", "10.0", "none", "Check",
+         "By Bike", "10 Lovely Street", "Herndon", "20170", "UPS Ground", "none"].join(" ")
+      }
 
-    before do
-      login_as(distributor.owner)
-      visit admin_reports_path
-      click_link "Orders And Distributors"
-      run_report
+      before do
+        login_as(distributor.owner)
+        visit admin_reports_path
+        click_link "Orders And Distributors"
+        run_report
+      end
+
+      it "generates the report" do
+        rows = find("table.report__table").all("thead tr")
+        table_headers = rows.map { |r| r.all("th").map { |c| c.text.strip } }
+
+        expect(table_headers).to eq([
+                                      ['Order date',
+                                       'Order Id',
+                                       'Customer Name',
+                                       'Customer Email',
+                                       'Customer Phone',
+                                       'Customer City',
+                                       'SKU',
+                                       'Item name',
+                                       'Variant',
+                                       'Quantity',
+                                       'Max Quantity',
+                                       'Cost',
+                                       'Shipping Cost',
+                                       'Payment Method',
+                                       'Distributor',
+                                       'Distributor address',
+                                       'Distributor city',
+                                       'Distributor postcode',
+                                       'Shipping Method',
+                                       'Shipping instructions']
+                                    ])
+
+        expect(all('table.report__table tbody tr').count).to eq(
+          Spree::LineItem.where(
+            order_id: order.id # Total rows should equal nr. of line items, per order
+          ).count
+        )
+
+        # displays only orders from the hub it is managing
+        expect(page).to have_content(distributor.name), count: 5
+
+        # only sees line items from orders it manages
+        expect(page).not_to have_content(distributor2.name)
+
+        # displayes table contents correctly, per line item
+        table = page.find("table.report__table tbody")
+        expect(table).to have_content(line_item1)
+        expect(table).to have_content(line_item2)
+        expect(table).to have_content(line_item3)
+        expect(table).to have_content(line_item4)
+        expect(table).to have_content(line_item5)
+      end
     end
 
-    it "generates the report" do
-      rows = find("table.report__table").all("thead tr")
-      table_headers = rows.map { |r| r.all("th").map { |c| c.text.strip } }
+    context "as admin" do
+      before do
+        login_as_admin
+        visit admin_reports_path
+        click_link "Orders And Distributors"
+      end
 
-      expect(table_headers).to eq([
-                                    ['Order date',
-                                     'Order Id',
-                                     'Customer Name',
-                                     'Customer Email',
-                                     'Customer Phone',
-                                     'Customer City',
-                                     'SKU',
-                                     'Item name',
-                                     'Variant',
-                                     'Quantity',
-                                     'Max Quantity',
-                                     'Cost',
-                                     'Shipping Cost',
-                                     'Payment Method',
-                                     'Distributor',
-                                     'Distributor address',
-                                     'Distributor city',
-                                     'Distributor postcode',
-                                     'Shipping Method',
-                                     'Shipping instructions']
-                                  ])
+      context "with two orders on the same day at different times" do
+        let(:completed_at1) { 1500.hours.ago } # 1500 hours in the past
+        let(:completed_at2) { 1700.hours.ago } # 1700 hours in the past
+        let(:datetime_start1) { 1600.hours.ago } # 1600 hours in the past
+        let(:datetime_start2) { 1800.hours.ago } # 1600 hours in the past
+        let(:datetime_end) { 1400.hours.ago } # 1400 hours in the past
+        let!(:order3) {
+          create(:order_ready_to_ship, distributor_id: distributor.id, completed_at: completed_at1)
+        }
+        let!(:order4) {
+          create(:order_ready_to_ship, distributor_id: distributor.id, completed_at: completed_at2)
+        }
 
-      expect(all('table.report__table tbody tr').count).to eq(
-        Spree::LineItem.where(
-          order_id: order.id # Total rows should equal nr. of line items, per order
-        ).count
-      )
+        context "applying filters" do
+          it "displays line items from the correct distributors" do
+            # for one distributor
+            select2_select distributor.name, from: "q_distributor_id_in"
+            run_report
+            expect(page).to have_content(distributor.name), count: 15
 
-      # displays only orders from the hub it is managing
-      expect(page).to have_content(distributor.name), count: 5
-      expect(page).not_to have_content(distributor2.name)
+            clear_select2("#s2id_q_distributor_id_in")
 
-      # displayes table contents correctly, per line item
-      table = page.find("table.report__table tbody")
-      expect(table).to have_content(line_item1)
-      expect(table).to have_content(line_item2)
-      expect(table).to have_content(line_item3)
-      expect(table).to have_content(line_item4)
-      expect(table).to have_content(line_item5)
+            # for another distributor
+            select2_select distributor2.name, from: "q_distributor_id_in"
+            run_report
+            expect(page).to have_content(distributor2.name), count: 5
+          end
+        end
+      end
     end
   end
 end