diff --git a/magnum/tests/contrib/post_test_hook.sh b/magnum/tests/contrib/post_test_hook.sh
index 23bf6b5a98..79292d0c70 100755
--- a/magnum/tests/contrib/post_test_hook.sh
+++ b/magnum/tests/contrib/post_test_hook.sh
@@ -96,8 +96,11 @@ echo_summary "Create a flavor"
 nova flavor-create  m1.magnum 100 2048 8 1
 
 # Run functional tests
-echo "Running magnum functional test suite"
-sudo -E -H -u jenkins tox -e functional -- --concurrency=1
+
+# Currently we support functional-api, functional-k8s, will support swarm,
+# mesos later.
+echo "Running magnum functional test suite for $1"
+sudo -E -H -u jenkins tox -e functional-$1 -- --concurrency=1
 EXIT_CODE=$?
 
 # Delete the keypair used in the functional test.
diff --git a/magnum/tests/functional/k8s/__init__.py b/magnum/tests/functional/k8s/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/magnum/tests/functional/test_k8s_python_client.py b/magnum/tests/functional/k8s/test_k8s_python_client.py
similarity index 100%
rename from magnum/tests/functional/test_k8s_python_client.py
rename to magnum/tests/functional/k8s/test_k8s_python_client.py
diff --git a/magnum/tests/functional/test_magnum_python_client.py b/magnum/tests/functional/k8s/test_magnum_python_client.py
similarity index 100%
rename from magnum/tests/functional/test_magnum_python_client.py
rename to magnum/tests/functional/k8s/test_magnum_python_client.py
diff --git a/magnum/tests/functional/test_templates.py b/magnum/tests/functional/k8s/test_templates.py
similarity index 100%
rename from magnum/tests/functional/test_templates.py
rename to magnum/tests/functional/k8s/test_templates.py
diff --git a/tox.ini b/tox.ini
index 478833b4d4..19eea790fa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,9 +17,19 @@ commands =
   find . -type f -name "*.pyc" -delete
   bash tools/pretty_tox.sh '{posargs}'
 
-[testenv:functional]
+[testenv:functional-api]
 sitepackages = True
-setenv = OS_TEST_PATH=./magnum/tests/functional
+setenv = OS_TEST_PATH=./magnum/tests/functional/api
+         OS_TEST_TIMEOUT=7200
+deps =
+  {[testenv]deps}
+commands =
+  find . -type f -name "*.pyc" -delete
+  bash tools/pretty_tox.sh '{posargs}'
+
+[testenv:functional-k8s]
+sitepackages = True
+setenv = OS_TEST_PATH=./magnum/tests/functional/k8s
          OS_TEST_TIMEOUT=7200
 deps =
   {[testenv]deps}