diff --git a/tests/step-definitions/webship.js b/tests/step-definitions/webship.js
index e5afdba..6cc9ea9 100755
--- a/tests/step-definitions/webship.js
+++ b/tests/step-definitions/webship.js
@@ -194,7 +194,11 @@ When(/^(I|we)* fill in the following:$/, function (pronoundCase, table) {
  */
 When(/^(I|we)* select "([^"]*)?" from "([^"]*)?"$/, function (pronoundCase, option, dropdownlist) {
 
-  return browser.click('select' + dropdownlist + ' option[value=' + option + ']');
+  browser.element('css selector', "select[name=" + dropdownlist + "]", function (result) {
+    if (result.status === 0) {
+      return browser.click(dropdownlist + ' option[value=' + option + ']');
+    }
+  });
 });
 
 /**