diff --git a/Makefile b/Makefile
index 8ae4de941f..a5f0f82a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -567,6 +567,9 @@ docker-compose-test: docker-auth
 docker-compose-runtest:
 	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --user=$(shell id -u) --rm --service-ports awx /start_tests.sh
 
+docker-compose-build-swagger:
+	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --user=$(shell id -u) --rm --service-ports awx /start_tests.sh swagger
+
 docker-compose-clean:
 	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose run --rm -w /awx_devel --service-ports awx make clean
 	cd tools && TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose rm -sf
diff --git a/tools/docker-compose/start_tests.sh b/tools/docker-compose/start_tests.sh
index f2772258b4..7db222ed32 100755
--- a/tools/docker-compose/start_tests.sh
+++ b/tools/docker-compose/start_tests.sh
@@ -14,4 +14,4 @@ sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-IN
 cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link
 
 cp awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py
-make test
+make "${1:-test}"
diff --git a/tox.ini b/tox.ini
index c996dc3c03..c93df46e98 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     ui-lint,
     api,
     ui,
+    swagger,
 
 [testenv]
 ;basepython = python2.7
@@ -61,3 +62,11 @@ commands =
     make clean-ui
     make ui-devel
     make ui-test-ci
+
+
+[testenv:swagger]
+deps =
+    nodeenv
+commands =
+    make docker-compose-build
+    make docker-compose-build-swagger