diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 95d2b3be..de4365ff 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,6 +12,7 @@ services:
     ports:
       - 4064:4064
       - 4063:4063
+    command: /home/t/test/docker/init_testserver.sh
 
   test:
     build: ..
diff --git a/docker/init_testserver.sh b/docker/init_testserver.sh
new file mode 100755
index 00000000..94d54270
--- /dev/null
+++ b/docker/init_testserver.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Set up the data structure needed for the tests
+# (see setup.csv)
+
+cd $OMERO_HOME/bin
+
+./omero login root@localhost -w omero
+./omero obj new Dataset name=TestDataset
+./omero obj new Project name=TestProject
+./omero obj new ProjectDatasetLink parent=Project:1 child=Dataset:1
+touch "8bit-unsigned&pixelType=uint8&sizeZ=3&sizeC=5&sizeT=7&sizeX=512&sizeY=512.fake"
+./omero import "8bit-unsigned&pixelType=uint8&sizeZ=3&sizeC=5&sizeT=7&sizeX=512&sizeY=512.fake" -T Dataset:id:1
+
+./omero obj new CommentAnnotation textValue=BlaBla
+./omero obj new ImageAnnotationLink parent=Image:1 child=CommentAnnotation:1
+touch test.csv
+./omero upload test.csv
+./omero obj new FileAnnotation file=OriginalFile:47
+./omero obj new ImageAnnotationLink parent=Image:1 child=FileAnnotation:2
+
+./omero obj new Screen name=TestScreen
+touch "SPW&plates=1&plateRows=8&plateCols=8&fields=4&plateAcqs=1.fake"
+./omero import "SPW&plates=1&plateRows=8&plateCols=8&fields=4&plateAcqs=1.fake" -T Screen:id:1
+
+./omero obj new MapAnnotation
+./omero obj map-set MapAnnotation:3 mapValue testkey testvalue
+./omero obj new ScreenAnnotationLink parent=Screen:1 child=MapAnnotation:3
+
diff --git a/docker/runtest b/docker/runtest
index ea9be8ef..5b2fab62 100755
--- a/docker/runtest
+++ b/docker/runtest
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 cat <<EOF | R --no-save
 library(devtools)
 library(romero.gateway)