diff --git a/.travis.yml b/.travis.yml
index 8595a8c..203ba81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 sudo: required
-group: deprecated-2017Q2
 
 language: python
 
diff --git a/docker/runtest b/docker/runtest
index ad3ac90..ea9be8e 100755
--- a/docker/runtest
+++ b/docker/runtest
@@ -1,5 +1,28 @@
 #!/usr/bin/env bash
 cat <<EOF | R --no-save
 library(devtools)
+library(romero.gateway)
+
+# Retry connecting until server is up and running
+for (i in 1:60) {
+  server <- tryCatch(
+            {
+              server <- OMEROServer(host='omeroserver', port=4064, username='root', password='omero')
+              server <- connect(server)
+              return(server)
+            },
+            error=function(cond) {
+              Sys.sleep(10)
+              return(NA)
+            },
+            warning=function(cond) {
+            },
+            finally={
+            }
+          )
+  if (!is.na(server))
+    break
+}
+
 devtools::test()
 EOF