diff --git a/run_tests.sh b/run_tests.sh
index d9d15b8a..68f51e43 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -33,7 +33,7 @@ pip install tox
 
 # run through each tox env and execute the test
 for tox_env in $(awk -F= '/envlist/ {print $2}' tox.ini | sed 's/,/ /g'); do
-  if [ "${tox_env}" != "functional" ]; then
+  if [[ "${tox_env}" != "functional" ]] && [[ ${tox_env} != "func_*" ]]; then
     tox -e ${tox_env}
   elif [ "${tox_env}" == "functional" ]; then
     if ${FUNCTIONAL_TEST}; then
diff --git a/tox.ini b/tox.ini
index 06f2943d..1cc60551 100644
--- a/tox.ini
+++ b/tox.ini
@@ -160,6 +160,7 @@ commands =
 # NOTE(odyssey4me): this target does not use constraints because
 # it doesn't work in OpenStack-CI yet. Once that's fixed, we can
 # drop the install_command.
+# NOTE(andymccr): this will test standard Swift install.
 install_command =
     pip install -U --force-reinstall {opts} {packages}
 deps =
@@ -174,6 +175,23 @@ commands =
                      {toxinidir}/tests/test.yml -vvvv
 
 
+# NOTE(andymccr): this will test Swift running in pypy.
+[testenv:func_pypy]
+install_command =
+    pip install -U --force-reinstall {opts} {packages}
+deps =
+    {[testenv:ansible]deps}
+setenv =
+    {[testenv:ansible]setenv}
+commands =
+    {[testenv:ansible]commands}
+    ansible-playbook -i {toxinidir}/tests/inventory \
+                     -e "rolename={toxinidir}" \
+                     -e "install_test_packages=True" \
+                     -e "swift_pypy_enabled=True" \
+                     {toxinidir}/tests/test.yml -vvvv
+
+
 [testenv:linters]
 deps =
     {[testenv:ansible]deps}