diff --git a/.testr.conf b/.testr.conf
index 6d83b3c..5b3840b 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -2,6 +2,6 @@
 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
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${TESTS_DIR:-./oneview_client/tests/unit} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/oneview_client/tests/functional/__init__.py b/oneview_client/tests/functional/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/oneview_client/tests/unit/__init__.py b/oneview_client/tests/unit/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/oneview_client/tests/test_exceptions.py b/oneview_client/tests/unit/test_exceptions.py
similarity index 100%
rename from oneview_client/tests/test_exceptions.py
rename to oneview_client/tests/unit/test_exceptions.py
diff --git a/oneview_client/tests/test_models.py b/oneview_client/tests/unit/test_models.py
similarity index 100%
rename from oneview_client/tests/test_models.py
rename to oneview_client/tests/unit/test_models.py
diff --git a/oneview_client/tests/test_oneview_client.py b/oneview_client/tests/unit/test_oneview_client.py
similarity index 98%
rename from oneview_client/tests/test_oneview_client.py
rename to oneview_client/tests/unit/test_oneview_client.py
index b6062d8..0c1bdbd 100644
--- a/oneview_client/tests/test_oneview_client.py
+++ b/oneview_client/tests/unit/test_oneview_client.py
@@ -732,19 +732,24 @@ class OneViewClientTestCase(unittest.TestCase):
             driver_info
         )
 
+    @mock.patch.object(client.Client, 'get_server_hardware_by_uuid',
+                       autospec=True)
     @mock.patch.object(client.Client, 'get_server_hardware',
                        autospec=True)
     def test_is_node_port_mac_compatible_with_server_hardware(
-        self, mock_server_hardware, mock__authenticate
+        self, mock_server_hardware, mock_server_hardware_by_uuid,
+        mock__authenticate
     ):
         server_hardware_mock = ServerHardware()
         setattr(server_hardware_mock, "uri", "/anyuri")
+        setattr(server_hardware_mock, "uuid", "1111-2222-3333")
         server_hardware_mock_port_map = PORT_MAP
         setattr(server_hardware_mock,
                 "port_map",
                 server_hardware_mock_port_map)
 
         mock_server_hardware.return_value = server_hardware_mock
+        mock_server_hardware_by_uuid.return_value = server_hardware_mock
 
         oneview_client = client.Client(self.manager_url,
                                        self.username,
@@ -757,19 +762,24 @@ class OneViewClientTestCase(unittest.TestCase):
 
         mock_server_hardware.assert_called_once_with(oneview_client, {})
 
+    @mock.patch.object(client.Client, 'get_server_hardware_by_uuid',
+                       autospec=True)
     @mock.patch.object(client.Client, 'get_server_hardware',
                        autospec=True)
     def test_is_node_port_mac_incompatible_with_server_hardware(
-        self, mock_server_hardware, mock__authenticate
+        self, mock_server_hardware, mock_server_hardware_by_uuid,
+        mock__authenticate
     ):
         server_hardware_mock = ServerHardware()
         setattr(server_hardware_mock, "uri", "/anyuri")
+        setattr(server_hardware_mock, "uuid", "1111-2222-3333")
         server_hardware_mock_port_map = PORT_MAP
         setattr(server_hardware_mock,
                 "port_map",
                 server_hardware_mock_port_map)
 
         mock_server_hardware.return_value = server_hardware_mock
+        mock_server_hardware_by_uuid.return_value = server_hardware_mock
 
         exc_expected_msg = (
             "The ports of the node are not compatible with its server hardware"
@@ -1091,5 +1101,6 @@ class OneViewClientTestCase(unittest.TestCase):
             ports
         )
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tox.ini b/tox.ini
index 8b4e2d5..817b98b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,11 @@ commands = python setup.py build_sphinx
 commands = oslo_debug_helper {posargs}
 
 [flake8]
-# E123, E125 skipped as they are invalid PEP-8.
+exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
+
+[testenv:functional]
+setenv = TESTS_DIR=./oneview_client/tests/functional
+         LANGUAGE=en_US
 
 show-source = True
 ignore = E123,E125