diff --git a/Makefile b/Makefile
index c3f52c4..5ed5f51 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,22 @@ release:
 	git push --tags
 	$(MAKE) pypi
 
+docker-test-all: docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3
+
+docker-test-2.6:
+	docker build -t ipaddress-python2.6 . -f test-python2.6.Dockerfile
+
+docker-test-2.7:
+	docker build -t ipaddress-python2.7 . -f test-python2.7.Dockerfile
+
+docker-test-3.2:
+	docker build -t ipaddress-python3.2 . -f test-python3.2.Dockerfile
+
+docker-test-3.3:
+	docker build -t ipaddress-python3.3 . -f test-python3.3.Dockerfile
+
 clean:
 	rm -rf -- build dist ipaddress.egg-info
 
-.PHONY: default test clean pypi lint
+.PHONY: default test clean pypi lint docker-test-all docker-test-2.6 docker-test-2.7 docker-test-3.2 docker-test-3.3
 
diff --git a/Dockerfile.python2.6 b/test-python2.6.Dockerfile
similarity index 66%
rename from Dockerfile.python2.6
rename to test-python2.6.Dockerfile
index 1c11f9f..5e16329 100644
--- a/Dockerfile.python2.6
+++ b/test-python2.6.Dockerfile
@@ -1,7 +1,7 @@
 FROM lovato/python-2.6.6
 # Dockerfile to run tests under python2.6
 
-# docker build -t ipaddress-python2.6 . -f Dockerfile.python2.6
+# docker build -t ipaddress-python2.6 . -f test-python2.6.Dockerfile
 
 ADD . .
 RUN python test_ipaddress.py
diff --git a/Dockerfile.python2.7 b/test-python2.7.Dockerfile
similarity index 73%
rename from Dockerfile.python2.7
rename to test-python2.7.Dockerfile
index 0e92635..9c58f6b 100644
--- a/Dockerfile.python2.7
+++ b/test-python2.7.Dockerfile
@@ -1,7 +1,7 @@
 FROM python:2.7-alpine
 # Dockerfile to run tests under python2.7
 
-# docker build -t ipaddress-python2.7 . -f Dockerfile.python2.7
+# docker build -t ipaddress-python2.7 . -f test-python2.7.Dockerfile
 RUN apk add make
 RUN pip install flake8
 
diff --git a/test-python3.2.Dockerfile b/test-python3.2.Dockerfile
new file mode 100644
index 0000000..56d2b46
--- /dev/null
+++ b/test-python3.2.Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3.2-slim
+# Dockerfile to run tests under python3.2
+
+# docker build -t ipaddress-python3.2 . -f test-python3.2.Dockerfile
+
+ADD . .
+RUN python test_ipaddress.py
+CMD python test_ipaddress.py
diff --git a/test-python3.3.Dockerfile b/test-python3.3.Dockerfile
new file mode 100644
index 0000000..87c504e
--- /dev/null
+++ b/test-python3.3.Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3.3-alpine
+# Dockerfile to run tests under python3.3
+
+# docker build -t ipaddress-python3.3 . -f test-python3.3.Dockerfile
+
+ADD . .
+RUN python test_ipaddress.py
+CMD python test_ipaddress.py