diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 53eec19a..3a7106e4 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -141,7 +141,7 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
         """
         u.log.debug('Extended wait and check ...')
         time.sleep(sleep)
-        self.d.sentry.wait()
+        self.d.sentry.wait(timeout=900)
         time.sleep(sleep)
         self._auto_wait_for_status(exclude_services=exclude_services)
         time.sleep(sleep)
diff --git a/tests/dev-basic-xenial-queens b/tests/gate-basic-xenial-queens
similarity index 100%
rename from tests/dev-basic-xenial-queens
rename to tests/gate-basic-xenial-queens