diff --git a/Makefile b/Makefile
index 055094b..6a02798 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@
 
 build: protos containers
 
-containers: docker-base voltha chameleon ofagent podder netconf shovel onos
+containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester
 
 docker-base:
 	docker build -t cord/voltha-base -f docker/Dockerfile.base .
@@ -102,6 +102,9 @@
 onos:
 	docker build -t cord/onos -f docker/Dockerfile.onos docker
 
+tester:
+	docker build -t cord/onos -f docker/Dockerfile.tester docker
+
 protos:
 	make -C voltha/protos
 	make -C chameleon/protos
diff --git a/docker/Dockerfile.tester b/docker/Dockerfile.tester
new file mode 100644
index 0000000..a7778df
--- /dev/null
+++ b/docker/Dockerfile.tester
@@ -0,0 +1,9 @@
+FROM cord/voltha-base
+
+MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
+MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
+MAINTAINER Nathan Knuth   <nathan.knuth@tibitcom.com>
+
+RUN apt update && apt install -y iperf isc-dhcp-client tcpdump net-tools iproute2 iputils-ping wpasupplicant
+
+COPY config/wpa_supplicant.conf /etc/wpa_supplicant/
diff --git a/docker/config/wpa_supplicant.conf b/docker/config/wpa_supplicant.conf
new file mode 100644
index 0000000..1f0a99c
--- /dev/null
+++ b/docker/config/wpa_supplicant.conf
@@ -0,0 +1,15 @@
+ctrl_interface=/var/run/wpa_supplicant
+eapol_version=1
+ap_scan=0
+fast_reauth=1
+network={
+        key_mgmt=WPA-EAP
+        eap=MD5
+        identity="user"
+        password="password"
+        ca_cert="/etc/cert/cacert.pem"
+        client_cert="/etc/cert/client.pem"
+        private_key="/etc/cert/client.key"
+        private_key_passwd="whatever"
+        eapol_flags=3
+}