diff --git a/.travis.yml b/.travis.yml
index 88a1508..98168a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ go:
   - "1.10"
 
 services:
- - docker
+  - docker
 
 go_import_path: "github.com/ibm-messaging/mq-container"
 
@@ -13,6 +13,14 @@ cache:
   directories:
     - downloads
 
+env:
+  - DOCKER_DOWNGRADE=echo nothing to be done
+  - DOCKER_DOWNGRADE=sudo apt-get autoremove -y docker-ce &
+    curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add - &
+    sudo apt-add-repository "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" &
+    sudo apt-get update &
+    sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs)
+
 before_install:
   - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
   - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
@@ -26,11 +34,13 @@ install:
   - echo nothing
 
 script:
- - make deps
- - make vet
- - make build-devserver
- - make test-devserver
+  - make deps
+  - make vet
+  - make build-devserver
+  - make build-devjmstest
+  - exec $DOCKER_DOWNGRADE
+  - make test-devserver
 
 after_success:
- - go get golang.org/x/lint/golint
- - make lint
+  - go get golang.org/x/lint/golint
+  - make lint
diff --git a/Makefile b/Makefile
index e82a7ec..a067a23 100644
--- a/Makefile
+++ b/Makefile
@@ -152,7 +152,7 @@ build-devjmstest:
 	cd test/messaging && docker build --tag $(DEV_JMS_IMAGE) .
 
 .PHONY: test-devserver
-test-devserver: test/docker/vendor build-devjmstest
+test-devserver: test/docker/vendor
 	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on Docker"$(END)))
 	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)