diff --git a/Makefile-RHEL b/Makefile-RHEL
index 90d7da0..c42d36c 100644
--- a/Makefile-RHEL
+++ b/Makefile-RHEL
@@ -39,8 +39,6 @@ MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TA
 MQ_IMAGE_SDK ?=mq-sdk:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG)
 # MQ_IMAGE_GOLANG_SDK is the name and tag of the built MQ Advanced for Developers SDK image, plus Go tools
 MQ_IMAGE_GOLANG_SDK ?=mq-golang-sdk:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG)
-# DOCKER is the Docker command to run
-DOCKER ?= podman
 # MQ_PACKAGES specifies the MQ packages to install.  Defaults vary on base image.
 MQ_PACKAGES ?= MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm
 
@@ -49,8 +47,6 @@ MQ_PACKAGES ?= MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSe
 ###############################################################################
 # ARCH is the platform architecture (e.g. x86_64, ppc64le or s390x)
 ARCH = $(shell uname -m)
-# BUILD_SERVER_CONTAINER is the name of the web server container used at build time
-BUILD_SERVER_CONTAINER=build-server
 # NUM_CPU is the number of CPUs available to Docker.  Used to control how many
 # test run in parallel
 NUM_CPU = $(or $(shell docker info --format "{{ .NCPU }}"),2)
@@ -90,6 +86,10 @@ MQ_ARCHIVE_DEV_9.1.0.0=mqadv_dev910_linux_$(MQ_DEV_ARCH).tar.gz
 # Build targets
 ###############################################################################
 
+# Vendor Go dependencies for the Docker tests
+test/docker/vendor:
+	cd test/docker && dep ensure -vendor-only
+
 downloads/$(MQ_ARCHIVE_DEV):
 	$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced for Developers "$(MQ_VERSION)$(END)))
 	mkdir -p downloads
@@ -105,24 +105,37 @@ check-prereqs:
 	which podman || (echo "Missing required program podman" && exit 1)
 	yum list | grep yum-utils || (echo "Missing required package yum-utils" && exit 1)
 
+.PHONY: check-test-prereqs
+check-prereqs:
+	$(info $(SPACER)$(shell printf $(TITLE)"Checking for prereqs"$(END)))
+	which buildah || (echo "Missing required program buildah" && exit 1)
+	which docker || (echo "Missing required program docker" && exit 1)
 
 .PHONY: test-advancedserver
-test-advancedserver: 
+test-advancedserver: check-test-prereqs test/docker/vendor
 	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER) on $(shell docker --version)"$(END)))
+	buildah push $(MQ_IMAGE_ADVANCEDSERVER) docker-daemon:$(MQ_IMAGE_ADVANCEDSERVER)
+	docker tag docker.io/$(MQ_IMAGE_ADVANCEDSERVER) $(MQ_IMAGE_ADVANCEDSERVER)
+	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER)
 
 
 .PHONY: test-devserver
-test-devserver: 
+test-devserver: check-test-prereqs test/docker/vendor
 	$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on $(shell docker --version)"$(END)))
+	buildah push $(MQ_IMAGE_DEVSERVER) docker-daemon:$(MQ_IMAGE_DEVSERVER)
+	docker tag docker.io/$(MQ_IMAGE_DEVSERVER) $(MQ_IMAGE_DEVSERVER)
+	cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)
 
 
 .PHONY: build-advancedserver
+build-advancedserver: MQ_SDK_ARCHIVE=$(MQ_ARCHIVE)
 build-advancedserver: check-prereqs downloads/$(MQ_ARCHIVE) build-go-programs
 	$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER)"$(END)))
 	mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_ADVANCEDSERVER)" "$(MQ_VERSION)" "$(MQDEV)"
 
 
 .PHONY: build-devserver
+build-devserver: MQ_SDK_ARCHIVE=$(MQ_ARCHIVE_DEV)
 build-devserver: MQDEV=TRUE
 build-devserver: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm MQSeriesWeb-*.rpm
 build-devserver: check-prereqs downloads/$(MQ_ARCHIVE_DEV) build-go-programs
@@ -142,4 +155,11 @@ build-go-programs: check-prereqs build-mqgolang-sdk
 	$(info $(SPACER)$(shell printf $(TITLE)"Build go programs"$(END)))
 	IMAGE_REVISION=$(IMAGE_REVISION) IMAGE_SOURCE=$(IMAGE_SOURCE) mq-advanced-server-rhel/go-buildah.sh "$(MQ_IMAGE_GOLANG_SDK)" "$(MQDEV)"
 
+.PHONY: build-devjmstest
+build-devjmstest: check-test-prereqs
+	$(info $(SPACER)$(shell printf $(TITLE)"Build JMS tests for developer config"$(END)))
+	cd test/messaging && ./buildah.sh $(DEV_JMS_IMAGE)
+	buildah push $(DEV_JMS_IMAGE) docker-daemon:$(DEV_JMS_IMAGE)
+	docker tag docker.io/$(DEV_JMS_IMAGE) $(DEV_JMS_IMAGE)
+
 include formatting.mk
diff --git a/test/messaging/buildah.sh b/test/messaging/buildah.sh
new file mode 100755
index 0000000..25bf922
--- /dev/null
+++ b/test/messaging/buildah.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+# © Copyright IBM Corporation 2018
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -x
+set -e
+
+###############################################################################
+# Setup MQ JMS Test container
+###############################################################################
+
+# Use a "scratch" container, so the resulting image has minimal files
+# Resulting image won't have yum, for example
+readonly ctr_mq=$(buildah from scratch)
+readonly mnt_mq=$(buildah mount $ctr_mq)
+readonly imagename=$1
+
+# Initialize yum for use with the scratch container
+rpm --root $mnt_mq --initdb
+
+yumdownloader --destdir=/tmp redhat-release-server
+rpm --root $mnt_mq -ihv /tmp/redhat-release-server*.rpm || true
+
+yum --installroot $mnt_mq install -y \
+    java-1.7.0-openjdk-devel \
+    java \
+    which \
+    wget
+
+buildah run $ctr_mq -- sh -c "cd /tmp && wget http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-3.2.2-bin.tar.gz"
+tar xvf $mnt_mq/tmp/apache-maven-3.2.2-bin.tar.gz -C $mnt_mq/tmp/
+
+mkdir -p $mnt_mq/usr/src/mymaven
+cp pom.xml $mnt_mq/usr/src/mymaven/
+cp -R src $mnt_mq/usr/src/mymaven/src
+
+buildah run $ctr_mq -- sh -c "cd /usr/src/mymaven && export M2_HOME=/tmp/apache-maven-3.2.2 && export M2=\$M2_HOME/bin && export PATH=\$M2:\$PATH && mvn --version && mvn dependency:go-offline install && mvn --offline install"
+
+mkdir -p $mnt_mq/opt/app
+
+cp $mnt_mq/usr/src/mymaven/target/*.jar $mnt_mq/opt/app/
+cp $mnt_mq/usr/src/mymaven/target/lib/*.jar $mnt_mq/opt/app/
+
+###############################################################################
+# Post install tidy up
+###############################################################################
+
+rm -rf $mnt_mq/tmp/*
+rm -rf $mnt_mq/usr/src/mymaven
+
+# We can't uninstall tar or gzip because 
+yum --installroot $mnt_mq remove -y \
+    wget 
+
+###############################################################################
+# Contain image finalization
+###############################################################################
+
+buildah config \
+  --os linux \
+  --label architecture=x86_64 \
+  --label name="${imagename%:*}" \
+  --entrypoint '["java", "-classpath", "/opt/app/*", "org.junit.platform.console.ConsoleLauncher", "-p", "com.ibm.mqcontainer.test", "--details", "verbose"]' \
+  $ctr_mq
+buildah unmount $ctr_mq
+buildah commit $ctr_mq $imagename
+
+buildah rm $ctr_mq