diff --git a/tests/behat/customfilter_multiselect.feature b/tests/behat/customfilter_multiselect.feature
index 04fcc388..e20d69ec 100644
--- a/tests/behat/customfilter_multiselect.feature
+++ b/tests/behat/customfilter_multiselect.feature
@@ -69,18 +69,24 @@ Feature: Create entry, add multiselect and use customfilter
       | type             | name               | value                |
       | text             | Text               | testtext2            |
     And I open the autocomplete suggestions list
-    And I click on "Opt2" item in the autocomplete list
+    And I click on "Opt1" item in the autocomplete list
     And I press "Save changes"
     And I press "Continue"
+    And I should see "Opt1"
 
     And I follow "Add a new entry"
     And I fill in the entry form fields
       | type             | name               | value                |
       | text             | Text               | testtext3            |
     And I open the autocomplete suggestions list
+    And I click on "Opt2" item in the autocomplete list
     And I click on "Opt3" item in the autocomplete list
     And I press "Save changes"
     And I press "Continue"
+    And I should see "Opt1"
+    And I should see "Opt2"
+    And I should see "Opt3"
+
 
     And I follow "Add a new entry"
     And I fill in the entry form fields
@@ -91,8 +97,11 @@ Feature: Create entry, add multiselect and use customfilter
     And I press "Save changes"
     And I press "Continue"
     Then I should see "testtext3"
+    And I should see "Opt1"
+    And I should see "Opt2"
     And I should see "Opt3"
-    And I should not see "Opt6"
+    And I should see "Opt4"
+    And I should not see "Opt5"
 
   @javascript
   Scenario: Use customfilter.
@@ -104,7 +113,9 @@ Feature: Create entry, add multiselect and use customfilter
     And I press the escape key
     And I press "id_customsearch"
     And I should see "Opt2"
-    And I should not see "Opt3"
+    And I should see "Opt3"
+    And I should not see "Opt1"
+    And I should not see "Opt4"
     And I should not see "Opt5"
 
     # Use customfilter to select Opt1 OR Opt2.
@@ -115,8 +126,8 @@ Feature: Create entry, add multiselect and use customfilter
     And I press "id_customsearch"
     And I should see "Opt1"
     And I should see "Opt2"
-    And I should see "Opt4"
-    And I should see "Opt5"
+    And I should see "Opt3"
+    And I should not see "Opt4"
     And I should not see "Opt3"
 
     # Use customfilter to select Opt1 AND Opt5 after deselecting Opt2.