diff --git a/openappstack/__main__.py b/openappstack/__main__.py
index 64b7638d9790b252ef7667de0f62a6cd26e4da41..c9c6f32f3f30e272d071b3cf7dd5fe81b61de546 100755
--- a/openappstack/__main__.py
+++ b/openappstack/__main__.py
@@ -296,11 +296,12 @@ def test(clus, args):
             log.info(command)
             command.append('-t {tag}'.format(tag=tag))
         log.info('Running behave command %s', command)
-        behave_main(command)
+        return_code = behave_main(command)
 
         # Remove behave.ini so we don't leave secrets hanging around.
         os.remove(behave_ini)
 
+        sys.exit(return_code)
 
 def create_domain_records(domain, droplet_ip, subdomain=None):
     """
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index 143c6e77781cf8deb0979ab8402b2037a80c35c2..0b6b91dc1aa2435d7f1fe5ec0ce8cde4f6dfbd08 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -199,7 +199,6 @@ class Cluster:
         behave_config['behave.userdata']['nextcloud.username'] = 'admin'
         behave_config['behave.userdata']['nextcloud.password'] = \
             nextcloud_admin_password
-
         behave_config['behave.userdata']['onlyoffice.url'] = \
             'https://office.{}/welcome'.format(self.domain)
 
diff --git a/test/behave/features/nextcloud.feature b/test/behave/features/nextcloud.feature
index 5fb9e6e43667357ed09e3bd0a23deae9961b0dcc..2bdf762fa15ff3ab0b476ccf2775e103b98ee499 100644
--- a/test/behave/features/nextcloud.feature
+++ b/test/behave/features/nextcloud.feature
@@ -4,6 +4,11 @@ Feature: Test nextcloud admin login
   I want to be able to login to nextcloud as the user admin
   And I want to be able to open a document in OnlyOffice
 
+Scenario: Test OnlyOffice welcome screen
+  When I open the onlyoffice URL
+  Then I expect that element "#status-ok-icon" is visible
+
+
 Scenario: Open nextcloud
   When I open the nextcloud URL
   Then I wait on element "input#user" for 25000ms to be visible
@@ -22,10 +27,7 @@ Scenario: Login to nextcloud
 Scenario: Close welcome to nextcloud modal
   When I close the nextcloud welcome wizard if it exists
   Then I wait on element "#firstrunwizard" for 1000ms to not exist
-
-Scenario: Test OnlyOffice welcome screen
-  When I open the onlyoffice URL
-  Then I expect that element "#status-ok-icon" is visible
+  And I wait on element ".actions a.button.new" for 5000ms to be visible
 
 Scenario: Create a new document in OnlyOffice
   When I click on the element ".actions a.button.new"
diff --git a/test/behave/features/steps/login.py b/test/behave/features/steps/login.py
index c662039c14dc92469808f2b53bf7df1fdc152eb3..b45ad5b90eb67616aa108e61e3c212cba674a031 100644
--- a/test/behave/features/steps/login.py
+++ b/test/behave/features/steps/login.py
@@ -10,6 +10,13 @@ from behave_webdriver.steps import *
 def before_all(context):
     pass  # login and save cookies here
 
+@when(u'I open the onlyoffice URL')
+@given(u'I open the onlyoffice URL')
+def step_impl(context):
+    """Open onlyoffice URL."""
+    print(context.nextcloud)
+    context.behave_driver.get(context.config.userdata.get('onlyoffice.url'))
+
 @when(u'I open the nextcloud URL')
 @given(u'I open the nextcloud URL')
 def step_impl(context):
@@ -23,13 +30,6 @@ def step_impl(context):
     """Open grafana URL."""
     context.behave_driver.get(context.grafana['url'])
 
-@when(u'I open the onlyoffice URL')
-@given(u'I open the onlyoffice URL')
-def step_impl(context):
-    """Open onlyoffice URL."""
-    context.behave_driver.get(context.onlyoffice['url'])
-
-
 @when(u'I enter the "{section}" "{cred_type}" in the inputfield "{element}"')
 def step_impl(context, section, cred_type, element):
     """Enter username/password into login inputfields."""