diff --git a/os_vif/tests/unit/__init__.py b/os_vif/tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/os_vif/tests/base.py b/os_vif/tests/unit/base.py
similarity index 100%
rename from os_vif/tests/base.py
rename to os_vif/tests/unit/base.py
diff --git a/os_vif/tests/test_exception.py b/os_vif/tests/unit/test_exception.py
similarity index 97%
rename from os_vif/tests/test_exception.py
rename to os_vif/tests/unit/test_exception.py
index 0d2ce252..5385613e 100644
--- a/os_vif/tests/test_exception.py
+++ b/os_vif/tests/unit/test_exception.py
@@ -13,7 +13,7 @@
 import six
 
 from os_vif import exception
-from os_vif.tests import base
+from os_vif.tests.unit import base
 
 """Mostly inspired by os-brick's tests."""
 
diff --git a/os_vif/tests/test_host_info.py b/os_vif/tests/unit/test_host_info.py
similarity index 99%
rename from os_vif/tests/test_host_info.py
rename to os_vif/tests/unit/test_host_info.py
index bc4648db..2ed3722d 100644
--- a/os_vif/tests/test_host_info.py
+++ b/os_vif/tests/unit/test_host_info.py
@@ -12,7 +12,7 @@
 
 from os_vif import exception
 from os_vif import objects
-from os_vif.tests import base
+from os_vif.tests.unit import base
 
 
 class TestHostInfo(base.TestCase):
diff --git a/os_vif/tests/test_os_vif.py b/os_vif/tests/unit/test_os_vif.py
similarity index 99%
rename from os_vif/tests/test_os_vif.py
rename to os_vif/tests/unit/test_os_vif.py
index 90c9016e..f7b34ec8 100644
--- a/os_vif/tests/test_os_vif.py
+++ b/os_vif/tests/unit/test_os_vif.py
@@ -18,7 +18,7 @@ import os_vif
 from os_vif import exception
 from os_vif import objects
 from os_vif import plugin
-from os_vif.tests import base
+from os_vif.tests.unit import base
 
 
 class DemoPlugin(plugin.PluginBase):
diff --git a/os_vif/tests/test_vif.py b/os_vif/tests/unit/test_vif.py
similarity index 99%
rename from os_vif/tests/test_vif.py
rename to os_vif/tests/unit/test_vif.py
index 9f2d008a..590c721c 100644
--- a/os_vif/tests/test_vif.py
+++ b/os_vif/tests/unit/test_vif.py
@@ -15,7 +15,7 @@ from oslo_versionedobjects import fixture
 
 import os_vif
 from os_vif import objects
-from os_vif.tests import base
+from os_vif.tests.unit import base
 
 
 class TestVIFS(base.TestCase):
diff --git a/vif_plug_linux_bridge/tests/unit/__init__.py b/vif_plug_linux_bridge/tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vif_plug_linux_bridge/tests/test_linux_net.py b/vif_plug_linux_bridge/tests/unit/test_linux_net.py
similarity index 100%
rename from vif_plug_linux_bridge/tests/test_linux_net.py
rename to vif_plug_linux_bridge/tests/unit/test_linux_net.py
diff --git a/vif_plug_linux_bridge/tests/test_plugin.py b/vif_plug_linux_bridge/tests/unit/test_plugin.py
similarity index 100%
rename from vif_plug_linux_bridge/tests/test_plugin.py
rename to vif_plug_linux_bridge/tests/unit/test_plugin.py
diff --git a/vif_plug_ovs/tests/unit/__init__.py b/vif_plug_ovs/tests/unit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vif_plug_ovs/tests/test_linux_net.py b/vif_plug_ovs/tests/unit/test_linux_net.py
similarity index 100%
rename from vif_plug_ovs/tests/test_linux_net.py
rename to vif_plug_ovs/tests/unit/test_linux_net.py
diff --git a/vif_plug_ovs/tests/test_plugin.py b/vif_plug_ovs/tests/unit/test_plugin.py
similarity index 100%
rename from vif_plug_ovs/tests/test_plugin.py
rename to vif_plug_ovs/tests/unit/test_plugin.py