diff --git a/glance/tests/functional/serial/__init__.py b/glance/tests/functional/serial/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/glance/tests/functional/test_scrubber.py b/glance/tests/functional/serial/test_scrubber.py
similarity index 100%
rename from glance/tests/functional/test_scrubber.py
rename to glance/tests/functional/serial/test_scrubber.py
diff --git a/serial-functests.txt b/serial-functests.txt
new file mode 100644
index 0000000000..7e37e789b3
--- /dev/null
+++ b/serial-functests.txt
@@ -0,0 +1 @@
+^glance\.tests\.functional\.serial\.*
diff --git a/tox.ini b/tox.ini
index cfcbab4068..21a1567921 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,14 +39,16 @@ commands = ostestr --slowest {posargs}
 setenv =
   TEST_PATH = ./glance/tests/functional
 commands =
-  ostestr {posargs}
+  stestr run --blacklist-file ./serial-functests.txt {posargs}
+  stestr run --serial --combine --whitelist-file ./serial-functests.txt {posargs}
 
 [testenv:functional-py35]
 basepython = python3.5
 setenv =
   TEST_PATH = ./glance/tests/functional
 commands =
-  ostestr '{posargs}'
+  stestr run --blacklist-file ./serial-functests.txt {posargs}
+  stestr run --serial --combine --whitelist-file ./serial-functests.txt {posargs}
 
 [testenv:pep8]
 commands =