diff --git a/plugins/extensions/pykrita/CMakeLists.txt b/plugins/extensions/pykrita/CMakeLists.txt
--- a/plugins/extensions/pykrita/CMakeLists.txt
+++ b/plugins/extensions/pykrita/CMakeLists.txt
@@ -31,6 +31,6 @@
 add_subdirectory(plugin)
 add_subdirectory(kritarunner)
 
-add_test(pythonUnitTests ${PYTHON_EXECUTABLE}  -m unittest discover "${CMAKE_INSTALL_PREFIX}" -s ${CMAKE_SOURCE_DIR}/plugins/extensions/pykrita/tests -p "*_test.py")
+add_test(pythonUnitTests ${PYTHON_EXECUTABLE} -m unittest discover "${CMAKE_INSTALL_PREFIX}" "${CMAKE_SOURCE_DIR}" -s ${CMAKE_SOURCE_DIR}/plugins/extensions/pykrita/tests -p "*_test.py")
 
 endif ()
diff --git a/plugins/extensions/pykrita/sip/krita/Action.sip b/plugins/extensions/pykrita/sip/krita/Action.sip
--- a/plugins/extensions/pykrita/sip/krita/Action.sip
+++ b/plugins/extensions/pykrita/sip/krita/Action.sip
@@ -3,9 +3,10 @@
 %TypeHeaderCode
 #include "Action.h"
 %End
+
 public:
-    Action(QObject*  parent /TransferThis/ = 0);
-    Action(const QString & name, QAction*  action, QObject*  parent /TransferThis/ = 0);
+    explicit Action(QObject *parent /TransferThis/ = 0);
+    Action(const QString &name, QAction* action, QObject *parent /TransferThis/ = 0);
     virtual ~Action();
     bool operator==(const Action &other) const;
     bool operator!=(const Action &other) const;
@@ -32,4 +33,3 @@
     private:
     Action(const Action &); // Generated
 };
-
diff --git a/plugins/extensions/pykrita/tests/actionTests/__init__.py b/plugins/extensions/pykrita/tests/actionTests/__init__.py
new file mode 100644
--- /dev/null
+++ b/plugins/extensions/pykrita/tests/actionTests/__init__.py
@@ -0,0 +1,6 @@
+import sys
+
+
+inst_dir = sys.argv[2]
+source_dir = sys.argv[3]
+sys.path.insert(0, str("{0}/share/krita/pykrita/PyKrita").format(inst_dir))
diff --git a/plugins/extensions/pykrita/tests/action_test.py b/plugins/extensions/pykrita/tests/actionTests/action_test.py
rename from plugins/extensions/pykrita/tests/action_test.py
rename to plugins/extensions/pykrita/tests/actionTests/action_test.py
--- a/plugins/extensions/pykrita/tests/action_test.py
+++ b/plugins/extensions/pykrita/tests/actionTests/action_test.py
@@ -1,19 +1,18 @@
 import unittest
 import os
 import sys
-import test_utils
-
-
-# I will write a class decorator to avoid code repetition
-# at this point of the module
-test_utils.setPykritaInstPath()
+from krita import Action
+from PyQt5.QtWidgets import QAction
 
 
 class TestAction(unittest.TestCase):
 
     def setUp(self):
-        from krita import Action
         self.instance = Action()
 
     def testCreateNewAction(self):
         self.assertEqual(bool(self.instance), True)
+
+    def testCreateNewActionWithQAction(self):
+        new_action = Action("test", QAction("test"))
+        self.assertEqual(bool(new_action), True)
diff --git a/plugins/extensions/pykrita/tests/basetest.py b/plugins/extensions/pykrita/tests/basetest.py
new file mode 100644
--- /dev/null
+++ b/plugins/extensions/pykrita/tests/basetest.py
@@ -0,0 +1,8 @@
+import unittest
+import sys
+
+inst_dir = sys.argv[2]
+source_dir = sys.argv[3]
+sys.path.insert(0, str("{0}/share/krita/pykrita/PyKrita").format(inst_dir))
+
+from krita import *
diff --git a/plugins/extensions/pykrita/tests/test_utils.py b/plugins/extensions/pykrita/tests/test_utils.py
deleted file mode 100644
--- a/plugins/extensions/pykrita/tests/test_utils.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import sys
-
-
-def setPykritaInstPath():
-    """ The third argument in the cmake file must be the CMAKE_INST_DIR """
-
-    sys.path.insert(0, str("{0}/share/krita/pykrita/PyKrita").format(sys.argv[2]))