diff --git a/.testr.conf b/.testr.conf
index 6d83b3c4e..33839e913 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,7 +1,4 @@
 [DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
+test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./dragonflow/tests/unit} $LISTOPT $IDOPTION | cat
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/dragonflow/tests/fullstack/__init__.py b/dragonflow/tests/fullstack/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/dragonflow/tests/fullstack/test_plugin.py b/dragonflow/tests/fullstack/test_plugin.py
new file mode 100644
index 000000000..ef36e2d81
--- /dev/null
+++ b/dragonflow/tests/fullstack/test_plugin.py
@@ -0,0 +1,19 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from oslotest import base
+
+
+class TestPlugink(base.BaseTestCase):
+
+    def test_something(self):
+        pass
diff --git a/dragonflow/tests/test_dragonflow.py b/dragonflow/tests/unit/test_dragonflow.py
similarity index 100%
rename from dragonflow/tests/test_dragonflow.py
rename to dragonflow/tests/unit/test_dragonflow.py
diff --git a/tox.ini b/tox.ini
index 7a24fd437..af85175d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,10 @@ whitelist_externals = sh
 commands =
   sh tools/pretty_tox.sh '{posargs}'
 
+[testenv:fullstack]
+basepython = python2.7
+setenv = OS_TEST_PATH=./dragonflow/tests/fullstack
+
 [testenv:pep8]
 commands = flake8