diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index bfbf4e0a..9b4689da 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -15,6 +15,10 @@ pip install pytlv
 pip install pyyaml
 pip install cmd2
 
+# Execute automatically discovered unit tests first
+# TODO: uncomment once all tests are passing
+# python -m unittest discover -v -s tests/
+
 cd pysim-testdata
 ../tests/pysim-test.sh
 
diff --git a/pySim/utils_test.py b/tests/test_utils.py
similarity index 98%
rename from pySim/utils_test.py
rename to tests/test_utils.py
index 5cdb55eb..44fe631a 100644
--- a/pySim/utils_test.py
+++ b/tests/test_utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import unittest
-import utils 
+import pySim.utils as utils
 
 class DecTestCase(unittest.TestCase):