diff --git a/tests/network/__init__.py b/oslo_vmware/tests/network/__init__.py
similarity index 100%
rename from tests/network/__init__.py
rename to oslo_vmware/tests/network/__init__.py
diff --git a/tests/network/nsx/__init__.py b/oslo_vmware/tests/network/nsx/__init__.py
similarity index 100%
rename from tests/network/nsx/__init__.py
rename to oslo_vmware/tests/network/nsx/__init__.py
diff --git a/tests/network/nsx/nsxv/__init__.py b/oslo_vmware/tests/network/nsx/nsxv/__init__.py
similarity index 100%
rename from tests/network/nsx/nsxv/__init__.py
rename to oslo_vmware/tests/network/nsx/nsxv/__init__.py
diff --git a/tests/network/nsx/nsxv/test_nsxv_api.py b/oslo_vmware/tests/network/nsx/nsxv/test_nsxv_api.py
similarity index 100%
rename from tests/network/nsx/nsxv/test_nsxv_api.py
rename to oslo_vmware/tests/network/nsx/nsxv/test_nsxv_api.py
diff --git a/tests/network/nsx/nsxv/test_nsxv_api_helper.py b/oslo_vmware/tests/network/nsx/nsxv/test_nsxv_api_helper.py
similarity index 100%
rename from tests/network/nsx/nsxv/test_nsxv_api_helper.py
rename to oslo_vmware/tests/network/nsx/nsxv/test_nsxv_api_helper.py
diff --git a/tests/network/nsx/nsxv/test_nsxv_loadbalancer.py b/oslo_vmware/tests/network/nsx/nsxv/test_nsxv_loadbalancer.py
similarity index 100%
rename from tests/network/nsx/nsxv/test_nsxv_loadbalancer.py
rename to oslo_vmware/tests/network/nsx/nsxv/test_nsxv_loadbalancer.py
diff --git a/oslo_vmware/tests/objects/test_datastore.py b/oslo_vmware/tests/objects/test_datastore.py
index cb36ecc..801f24b 100644
--- a/oslo_vmware/tests/objects/test_datastore.py
+++ b/oslo_vmware/tests/objects/test_datastore.py
@@ -382,3 +382,18 @@ class DatastoreURLTestCase(base.TestCase):
         ticket = ds_url.get_transfer_ticket(session, 'PUT')
         self.assertEqual('%s="%s"' % (constants.CGI_COOKIE_KEY, 'fake_id'),
                          ticket)
+
+    def test_get_datastore_by_ref(self):
+        session = mock.Mock()
+        ds_ref = mock.Mock()
+        expected_props = {'summary.name': 'datastore1',
+                          'summary.type': 'NFS',
+                          'summary.freeSpace': 1000,
+                          'summary.capacity': 2000}
+        session.invoke_api = mock.Mock()
+        session.invoke_api.return_value = expected_props
+        ds_obj = datastore.get_datastore_by_ref(session, ds_ref)
+        self.assertEqual(expected_props['summary.name'], ds_obj.name)
+        self.assertEqual(expected_props['summary.type'], ds_obj.type)
+        self.assertEqual(expected_props['summary.freeSpace'], ds_obj.freespace)
+        self.assertEqual(expected_props['summary.capacity'], ds_obj.capacity)
diff --git a/oslo_vmware/tests/test_vim_util.py b/oslo_vmware/tests/test_vim_util.py
index a306d00..6548c5f 100644
--- a/oslo_vmware/tests/test_vim_util.py
+++ b/oslo_vmware/tests/test_vim_util.py
@@ -257,6 +257,43 @@ class VimUtilTest(base.TestCase):
         retrieve_result = object()
         self.assertFalse(vim_util._get_token(retrieve_result))
 
+    @mock.patch('oslo_vmware.vim_util.get_object_properties')
+    def test_get_object_properties_dict_empty(self, mock_obj_prop):
+        mock_obj_prop.return_value = None
+        vim = mock.Mock()
+        moref = mock.Mock()
+        res = vim_util.get_object_properties_dict(vim, moref, None)
+        self.assertEqual({}, res)
+
+    @mock.patch('oslo_vmware.vim_util.get_object_properties')
+    def test_get_object_properties_dict(self, mock_obj_prop):
+        expected_prop_dict = {'name': 'vm01'}
+        mock_obj_content = mock.Mock()
+        prop = mock.Mock()
+        prop.name = "name"
+        prop.val = "vm01"
+        mock_obj_content.propSet = [prop]
+        del mock_obj_content.missingSet
+        mock_obj_prop.return_value = [mock_obj_content]
+        vim = mock.Mock()
+        moref = mock.Mock()
+        res = vim_util.get_object_properties_dict(vim, moref, None)
+        self.assertEqual(expected_prop_dict, res)
+
+    @mock.patch('oslo_vmware.vim_util.get_object_properties')
+    def test_get_object_properties_dict_missing(self, mock_obj_prop):
+        mock_obj_content = mock.Mock()
+        missing_prop = mock.Mock()
+        missing_prop.path = "name"
+        missing_prop.fault = mock.Mock()
+        mock_obj_content.missingSet = [missing_prop]
+        del mock_obj_content.propSet
+        mock_obj_prop.return_value = [mock_obj_content]
+        vim = mock.Mock()
+        moref = mock.Mock()
+        res = vim_util.get_object_properties_dict(vim, moref, None)
+        self.assertEqual({}, res)
+
     @mock.patch('oslo_vmware.vim_util._get_token')
     def test_cancel_retrieval(self, get_token):
         token = mock.Mock()
diff --git a/tests/objects/test_datastore.py b/tests/objects/test_datastore.py
index aa88a22..2d66ccf 100644
--- a/tests/objects/test_datastore.py
+++ b/tests/objects/test_datastore.py
@@ -383,18 +383,3 @@ class DatastoreURLTestCase(base.TestCase):
         ticket = ds_url.get_transfer_ticket(session, 'PUT')
         self.assertEqual('%s="%s"' % (constants.CGI_COOKIE_KEY, 'fake_id'),
                          ticket)
-
-    def test_get_datastore_by_ref(self):
-        session = mock.Mock()
-        ds_ref = mock.Mock()
-        expected_props = {'summary.name': 'datastore1',
-                          'summary.type': 'NFS',
-                          'summary.freeSpace': 1000,
-                          'summary.capacity': 2000}
-        session.invoke_api = mock.Mock()
-        session.invoke_api.return_value = expected_props
-        ds_obj = datastore.get_datastore_by_ref(session, ds_ref)
-        self.assertEqual(expected_props['summary.name'], ds_obj.name)
-        self.assertEqual(expected_props['summary.type'], ds_obj.type)
-        self.assertEqual(expected_props['summary.freeSpace'], ds_obj.freespace)
-        self.assertEqual(expected_props['summary.capacity'], ds_obj.capacity)
diff --git a/tests/test_vim_util.py b/tests/test_vim_util.py
index b19cd48..44b6526 100644
--- a/tests/test_vim_util.py
+++ b/tests/test_vim_util.py
@@ -253,43 +253,6 @@ class VimUtilTest(base.TestCase):
         self.assertTrue(res is retrieve_result.objects)
         cancel_retrieval.assert_called_once_with(vim, retrieve_result)
 
-    @mock.patch('oslo_vmware.vim_util.get_object_properties')
-    def test_get_object_properties_dict_empty(self, mock_obj_prop):
-        mock_obj_prop.return_value = None
-        vim = mock.Mock()
-        moref = mock.Mock()
-        res = vim_util.get_object_properties_dict(vim, moref, None)
-        self.assertEqual({}, res)
-
-    @mock.patch('oslo_vmware.vim_util.get_object_properties')
-    def test_get_object_properties_dict(self, mock_obj_prop):
-        expected_prop_dict = {'name': 'vm01'}
-        mock_obj_content = mock.Mock()
-        prop = mock.Mock()
-        prop.name = "name"
-        prop.val = "vm01"
-        mock_obj_content.propSet = [prop]
-        del mock_obj_content.missingSet
-        mock_obj_prop.return_value = [mock_obj_content]
-        vim = mock.Mock()
-        moref = mock.Mock()
-        res = vim_util.get_object_properties_dict(vim, moref, None)
-        self.assertEqual(expected_prop_dict, res)
-
-    @mock.patch('oslo_vmware.vim_util.get_object_properties')
-    def test_get_object_properties_dict_missing(self, mock_obj_prop):
-        mock_obj_content = mock.Mock()
-        missing_prop = mock.Mock()
-        missing_prop.path = "name"
-        missing_prop.fault = mock.Mock()
-        mock_obj_content.missingSet = [missing_prop]
-        del mock_obj_content.propSet
-        mock_obj_prop.return_value = [mock_obj_content]
-        vim = mock.Mock()
-        moref = mock.Mock()
-        res = vim_util.get_object_properties_dict(vim, moref, None)
-        self.assertEqual({}, res)
-
     @mock.patch('oslo_vmware.vim_util._get_token')
     def test_cancel_retrieval(self, get_token):
         token = mock.Mock()