diff --git a/tests/unit/providers/test_utils_py2_py3.py b/tests/unit/providers/test_utils_py2_py3.py
deleted file mode 100644
index 3ff105a3..00000000
--- a/tests/unit/providers/test_utils_py2_py3.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""Dependency injector provider utils unit tests."""
-
-import unittest
-
-from dependency_injector import (
-    providers,
-    errors,
-)
-
-
-class IsProviderTests(unittest.TestCase):
-
-    def test_with_instance(self):
-        self.assertTrue(providers.is_provider(providers.Provider()))
-
-    def test_with_class(self):
-        self.assertFalse(providers.is_provider(providers.Provider))
-
-    def test_with_string(self):
-        self.assertFalse(providers.is_provider("some_string"))
-
-    def test_with_object(self):
-        self.assertFalse(providers.is_provider(object()))
-
-    def test_with_subclass_instance(self):
-        class SomeProvider(providers.Provider):
-            pass
-
-        self.assertTrue(providers.is_provider(SomeProvider()))
-
-    def test_with_class_with_getattr(self):
-        class SomeClass(object):
-            def __getattr__(self, _):
-                return False
-
-        self.assertFalse(providers.is_provider(SomeClass()))
-
-
-class EnsureIsProviderTests(unittest.TestCase):
-
-    def test_with_instance(self):
-        provider = providers.Provider()
-        self.assertIs(providers.ensure_is_provider(provider), provider)
-
-    def test_with_class(self):
-        self.assertRaises(errors.Error,
-                          providers.ensure_is_provider,
-                          providers.Provider)
-
-    def test_with_string(self):
-        self.assertRaises(errors.Error,
-                          providers.ensure_is_provider,
-                          "some_string")
-
-    def test_with_object(self):
-        self.assertRaises(errors.Error, providers.ensure_is_provider, object())
diff --git a/tests/unit/providers/utils/__init__.py b/tests/unit/providers/utils/__init__.py
new file mode 100644
index 00000000..1c2f9686
--- /dev/null
+++ b/tests/unit/providers/utils/__init__.py
@@ -0,0 +1 @@
+"""Provider utils tests."""
diff --git a/tests/unit/providers/utils/test_ensure_is_provider_py2_py3.py b/tests/unit/providers/utils/test_ensure_is_provider_py2_py3.py
new file mode 100644
index 00000000..8c41ac84
--- /dev/null
+++ b/tests/unit/providers/utils/test_ensure_is_provider_py2_py3.py
@@ -0,0 +1,24 @@
+"""Provider utils unit tests."""
+
+from dependency_injector import providers, errors
+from pytest import raises
+
+
+def test_with_instance():
+    provider = providers.Provider()
+    assert providers.ensure_is_provider(provider), provider
+
+
+def test_with_class():
+    with raises(errors.Error):
+        providers.ensure_is_provider(providers.Provider)
+
+
+def test_with_string():
+    with raises(errors.Error):
+        providers.ensure_is_provider("some_string")
+
+
+def test_with_object():
+    with raises(errors.Error):
+        providers.ensure_is_provider(object())
diff --git a/tests/unit/providers/utils/test_is_provider_py2_py3.py b/tests/unit/providers/utils/test_is_provider_py2_py3.py
new file mode 100644
index 00000000..4b9b9d87
--- /dev/null
+++ b/tests/unit/providers/utils/test_is_provider_py2_py3.py
@@ -0,0 +1,34 @@
+"""Provider utils unit tests."""
+
+from dependency_injector import providers
+
+
+def test_with_instance():
+    assert providers.is_provider(providers.Provider()) is True
+
+
+def test_with_class():
+    assert providers.is_provider(providers.Provider) is False
+
+
+def test_with_string():
+    assert providers.is_provider("some_string") is False
+
+
+def test_with_object():
+    assert providers.is_provider(object()) is False
+
+
+def test_with_subclass_instance():
+    class SomeProvider(providers.Provider):
+        pass
+
+    assert providers.is_provider(SomeProvider()) is True
+
+
+def test_with_class_with_getattr():
+    class SomeClass(object):
+        def __getattr__(self, _):
+            return False
+
+    assert providers.is_provider(SomeClass()) is False