Make PySide2 tests using the helper modules from 'util' self-contained

Add the relative import path to locate the modules "helper" and "py3kcompat". The tests can then be launched from the command line without the ctest environment. Change-Id: Ia50663d7381b52cb248de3e4d23002a195ca9139 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
author: Friedemann Kleint <Friedemann.Kleint@qt.io> 2020-02-13 09:43:03 +0100
committer: Friedemann Kleint <Friedemann.Kleint@qt.io> 2020-02-19 21:09:26 +0100
commit: 5b868dae533e37b13be7890840191263a2caaa23 (patch)
tree: 2de89f87e11aa94a007c45e8452b171caf867ba5
parent: 5899fa54279b9d7bfbdda8a8d2a1e60a3c7b264a (diff)
224 files changed, 1001 insertions, 74 deletions
diff --git a/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py b/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py
index 2c7f84ad3..0c2cec095 100644
--- a/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py
+++ b/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py
@@ -30,9 +30,14 @@
 
 '''Test cases for Q3DExtras'''
 
-from helper import UsesQGuiApplication
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from helper import UsesQGuiApplication
+
 from PySide2.QtCore import(Property, QObject, QPropertyAnimation, QTimer, Signal, Slot)
 from PySide2.QtGui import (QGuiApplication, QMatrix4x4, QQuaternion, QVector3D, QWindow)
 from PySide2.Qt3DCore import (Qt3DCore)
diff --git a/sources/pyside2/tests/QtCharts/qcharts_test.py b/sources/pyside2/tests/QtCharts/qcharts_test.py
index b540cf64c..20a122374 100644
--- a/sources/pyside2/tests/QtCharts/qcharts_test.py
+++ b/sources/pyside2/tests/QtCharts/qcharts_test.py
@@ -30,9 +30,13 @@
 
 '''Test cases for QCharts'''
 
-from helper import UsesQApplication
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from helper import UsesQApplication
 from PySide2.QtCore import QRect, QSize, QTimer
 from PySide2.QtGui import QGuiApplication, QScreen
 from PySide2.QtCharts import QtCharts
diff --git a/sources/pyside2/tests/QtCore/bug_1063.py b/sources/pyside2/tests/QtCore/bug_1063.py
index 2560448e8..1daaaa4dd 100644
--- a/sources/pyside2/tests/QtCore/bug_1063.py
+++ b/sources/pyside2/tests/QtCore/bug_1063.py
@@ -28,10 +28,14 @@
 
 ''' unit test for BUG #1063 '''
 
-import unittest
+import os
+import sys
 import tempfile
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore
-import os
 import py3kcompat as py3k
 
 class QTextStreamTestCase(unittest.TestCase):
diff --git a/sources/pyside2/tests/QtCore/bug_938.py b/sources/pyside2/tests/QtCore/bug_938.py
index 98b894735..6cbf5018b 100644
--- a/sources/pyside2/tests/QtCore/bug_938.py
+++ b/sources/pyside2/tests/QtCore/bug_938.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 import py3kcompat as py3k
 
diff --git a/sources/pyside2/tests/QtCore/bug_994.py b/sources/pyside2/tests/QtCore/bug_994.py
index 3b0ed0fd4..53e822bfc 100644
--- a/sources/pyside2/tests/QtCore/bug_994.py
+++ b/sources/pyside2/tests/QtCore/bug_994.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2.QtCore import QIODevice, QTextStream
 
diff --git a/sources/pyside2/tests/QtCore/child_event_test.py b/sources/pyside2/tests/QtCore/child_event_test.py
index d9c92d537..f121c975e 100644
--- a/sources/pyside2/tests/QtCore/child_event_test.py
+++ b/sources/pyside2/tests/QtCore/child_event_test.py
@@ -30,10 +30,13 @@
 
 '''Test case for QObject.childEvent and QTimer.childEvent overloading'''
 
+import os
+import sys
 import unittest
-from time import sleep
-from PySide2.QtCore import QObject, QTimer, QCoreApplication
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from PySide2.QtCore import QObject, QTimer, QCoreApplication
 from helper import UsesQCoreApplication
 
 class ExtQObject(QObject):
diff --git a/sources/pyside2/tests/QtCore/deepcopy_test.py b/sources/pyside2/tests/QtCore/deepcopy_test.py
index a79ccbe15..87fbe7a82 100644
--- a/sources/pyside2/tests/QtCore/deepcopy_test.py
+++ b/sources/pyside2/tests/QtCore/deepcopy_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
-import unittest
 from copy import deepcopy
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF
 from PySide2.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QDir, QPoint, QPointF
diff --git a/sources/pyside2/tests/QtCore/deletelater_test.py b/sources/pyside2/tests/QtCore/deletelater_test.py
index 3c4152f49..7b497f0c9 100644
--- a/sources/pyside2/tests/QtCore/deletelater_test.py
+++ b/sources/pyside2/tests/QtCore/deletelater_test.py
@@ -30,8 +30,12 @@
 
 '''Test cases for QTimer.singleShot'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QTimer, QCoreApplication, SIGNAL
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/QtCore/duck_punching_test.py b/sources/pyside2/tests/QtCore/duck_punching_test.py
index 48d86572a..3115454b1 100644
--- a/sources/pyside2/tests/QtCore/duck_punching_test.py
+++ b/sources/pyside2/tests/QtCore/duck_punching_test.py
@@ -30,9 +30,13 @@
 
 '''Test case for duck punching new implementations of C++ virtual methods into object instances.'''
 
-import unittest
-import types
+import os
 import sys
+import types
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/QtCore/qbytearray_buffer_protocol_test.py b/sources/pyside2/tests/QtCore/qbytearray_buffer_protocol_test.py
index 2ec6938bb..93527f9d7 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_buffer_protocol_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_buffer_protocol_test.py
@@ -31,10 +31,15 @@
 
 '''Tests QByteArray implementation of Python buffer protocol'''
 
+import os
+from os.path import isdir
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
-from os.path import isdir
 from PySide2.QtCore import QByteArray
 
 
diff --git a/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py b/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
index 1728c6823..a3986278c 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_concatenation_operator_test.py
@@ -31,8 +31,12 @@
 
 '''Test cases for QByteArray concatenation with '+' operator'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QByteArray
 import py3kcompat as py3k
 
diff --git a/sources/pyside2/tests/QtCore/qbytearray_operator_iadd_test.py b/sources/pyside2/tests/QtCore/qbytearray_operator_iadd_test.py
index a345db514..15d870bde 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_operator_iadd_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_operator_iadd_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QByteArray
 from helper.docmodifier import DocModifier
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtCore/qbytearray_operator_test.py b/sources/pyside2/tests/QtCore/qbytearray_operator_test.py
index 93140d1e0..69d016a6b 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_operator_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_operator_test.py
@@ -31,7 +31,12 @@
 
 '''Test cases for QByteArray operators'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QByteArray
diff --git a/sources/pyside2/tests/QtCore/qbytearray_test.py b/sources/pyside2/tests/QtCore/qbytearray_test.py
index 4760fe20b..99813425e 100644
--- a/sources/pyside2/tests/QtCore/qbytearray_test.py
+++ b/sources/pyside2/tests/QtCore/qbytearray_test.py
@@ -31,9 +31,14 @@
 
 '''Unit tests for QByteArray'''
 
-import unittest
 import ctypes
+import os
 import pickle
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QByteArray, QSettings, QObject, QDataStream, QIODevice
diff --git a/sources/pyside2/tests/QtCore/qdatastream_test.py b/sources/pyside2/tests/QtCore/qdatastream_test.py
index 812c2aab5..b50b1d157 100644
--- a/sources/pyside2/tests/QtCore/qdatastream_test.py
+++ b/sources/pyside2/tests/QtCore/qdatastream_test.py
@@ -30,7 +30,12 @@
 
 '''Unit tests for QDataStream'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QBitArray, QByteArray, QIODevice, QDataStream, QDate, QTime, QDateTime
diff --git a/sources/pyside2/tests/QtCore/qfile_test.py b/sources/pyside2/tests/QtCore/qfile_test.py
index 40f861e4c..69208a49d 100644
--- a/sources/pyside2/tests/QtCore/qfile_test.py
+++ b/sources/pyside2/tests/QtCore/qfile_test.py
@@ -26,11 +26,13 @@
 ##
 #############################################################################
 
-import unittest
-
 import os
-import tempfile
 import sys
+import tempfile
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QDir, QFile, QIODevice, QSaveFile, QTemporaryDir
diff --git a/sources/pyside2/tests/QtCore/qfileread_test.py b/sources/pyside2/tests/QtCore/qfileread_test.py
index 19e1ea371..16d9082fb 100644
--- a/sources/pyside2/tests/QtCore/qfileread_test.py
+++ b/sources/pyside2/tests/QtCore/qfileread_test.py
@@ -26,9 +26,11 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
-import os
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QIODevice, QTemporaryFile
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtCore/qjsondocument_test.py b/sources/pyside2/tests/QtCore/qjsondocument_test.py
index 0cd4dc5b2..65f83abe3 100644
--- a/sources/pyside2/tests/QtCore/qjsondocument_test.py
+++ b/sources/pyside2/tests/QtCore/qjsondocument_test.py
@@ -30,7 +30,12 @@
 
 '''Test cases for QJsonDocument/nullptr_t'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QJsonDocument
 import py3kcompat as py3k
 
diff --git a/sources/pyside2/tests/QtCore/qmessageauthenticationcode_test.py b/sources/pyside2/tests/QtCore/qmessageauthenticationcode_test.py
index 867862de5..2a63e25a2 100644
--- a/sources/pyside2/tests/QtCore/qmessageauthenticationcode_test.py
+++ b/sources/pyside2/tests/QtCore/qmessageauthenticationcode_test.py
@@ -30,8 +30,12 @@
 
 '''Test cases for QMessageAuthenticationCode'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QCryptographicHash, QMessageAuthenticationCode
 import py3kcompat as py3k
 
diff --git a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
index fdd71957b..a7774b996 100644
--- a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
@@ -30,7 +30,12 @@
 
 ''' Test case for QObject::connectNotify()'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/QtCore/qobject_event_filter_test.py b/sources/pyside2/tests/QtCore/qobject_event_filter_test.py
index e65757b17..15ba59f37 100644
--- a/sources/pyside2/tests/QtCore/qobject_event_filter_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_event_filter_test.py
@@ -28,9 +28,12 @@
 
 '''Test cases for QObject.eventFilter'''
 
+import os
+import sys
 import unittest
 import weakref
-import sys
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QObject, QTimerEvent
 
diff --git a/sources/pyside2/tests/QtCore/qobject_test.py b/sources/pyside2/tests/QtCore/qobject_test.py
index 2dd767c0d..ade885e7d 100644
--- a/sources/pyside2/tests/QtCore/qobject_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_test.py
@@ -31,7 +31,12 @@
 
 '''Test cases for QObject methods'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QObject, Signal, Qt
diff --git a/sources/pyside2/tests/QtCore/qobject_timer_event_test.py b/sources/pyside2/tests/QtCore/qobject_timer_event_test.py
index 39501237e..e960cac7e 100644
--- a/sources/pyside2/tests/QtCore/qobject_timer_event_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_timer_event_test.py
@@ -30,8 +30,12 @@
 
 '''Test case for QObject.timerEvent overloading'''
 
+import os
+import sys
 import unittest
-from time import sleep
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QCoreApplication
 
 from helper import UsesQCoreApplication
diff --git a/sources/pyside2/tests/QtCore/qobject_tr_as_instance_test.py b/sources/pyside2/tests/QtCore/qobject_tr_as_instance_test.py
index 420e39103..98ab373e4 100644
--- a/sources/pyside2/tests/QtCore/qobject_tr_as_instance_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_tr_as_instance_test.py
@@ -32,7 +32,12 @@
 '''Unit tests for QObject's tr static methods.'''
 
 import os
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject
 
 #from helper import UsesQCoreApplication
diff --git a/sources/pyside2/tests/QtCore/qprocess_test.py b/sources/pyside2/tests/QtCore/qprocess_test.py
index 23d44a21f..72b2e08cb 100644
--- a/sources/pyside2/tests/QtCore/qprocess_test.py
+++ b/sources/pyside2/tests/QtCore/qprocess_test.py
@@ -30,8 +30,12 @@
 
 '''Test cases for QProcess'''
 
-import unittest
 import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import *
diff --git a/sources/pyside2/tests/QtCore/qresource_test.py b/sources/pyside2/tests/QtCore/qresource_test.py
index 49c4a1049..d6d325951 100644
--- a/sources/pyside2/tests/QtCore/qresource_test.py
+++ b/sources/pyside2/tests/QtCore/qresource_test.py
@@ -30,7 +30,12 @@
 
 '''Test cases for QResource usage'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 from PySide2.QtCore import QFile, QIODevice
 import resources_mc
diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py
index 36a4c3c62..c151a5926 100644
--- a/sources/pyside2/tests/QtCore/qsettings_test.py
+++ b/sources/pyside2/tests/QtCore/qsettings_test.py
@@ -28,9 +28,12 @@
 
 '''Test cases for QDate'''
 
+import os
+import sys
 import unittest
 
-import os
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 import py3kcompat as py3k
 from PySide2.QtCore import QSettings
diff --git a/sources/pyside2/tests/QtCore/qstatemachine_test.py b/sources/pyside2/tests/QtCore/qstatemachine_test.py
index 34e107e50..d776a52a1 100644
--- a/sources/pyside2/tests/QtCore/qstatemachine_test.py
+++ b/sources/pyside2/tests/QtCore/qstatemachine_test.py
@@ -28,7 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QState, QFinalState, SIGNAL
 from PySide2.QtCore import QTimer, QStateMachine
 from PySide2.QtCore import QParallelAnimationGroup
diff --git a/sources/pyside2/tests/QtCore/qstring_test.py b/sources/pyside2/tests/QtCore/qstring_test.py
index e3ac812da..95900bc2f 100644
--- a/sources/pyside2/tests/QtCore/qstring_test.py
+++ b/sources/pyside2/tests/QtCore/qstring_test.py
@@ -31,7 +31,12 @@
 
 '''Test cases for QString'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2.QtCore import QObject
 
diff --git a/sources/pyside2/tests/QtCore/qtextstream_test.py b/sources/pyside2/tests/QtCore/qtextstream_test.py
index 6af7f46ba..a5a587d38 100644
--- a/sources/pyside2/tests/QtCore/qtextstream_test.py
+++ b/sources/pyside2/tests/QtCore/qtextstream_test.py
@@ -28,7 +28,12 @@
 
 '''Unit tests for QTextStream'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QByteArray, QTextStream, QIODevice, QTextCodec, QFile
diff --git a/sources/pyside2/tests/QtCore/qthread_test.py b/sources/pyside2/tests/QtCore/qthread_test.py
index 1df2c9994..c84022dc7 100644
--- a/sources/pyside2/tests/QtCore/qthread_test.py
+++ b/sources/pyside2/tests/QtCore/qthread_test.py
@@ -30,7 +30,12 @@
 
 '''Test cases for QThread'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QThread, QCoreApplication, QObject, SIGNAL, QMutex, QTimer
 from PySide2.QtCore import QEventLoop
 
diff --git a/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py b/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py
index e25a97c3e..e74099c77 100644
--- a/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py
+++ b/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py
@@ -30,8 +30,12 @@
 
 '''Test cases for QTimer.singleShot'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QTimer, QCoreApplication, Signal
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/QtCore/qtimer_timeout_test.py b/sources/pyside2/tests/QtCore/qtimer_timeout_test.py
index bb8caf84c..7e6c10f51 100644
--- a/sources/pyside2/tests/QtCore/qtimer_timeout_test.py
+++ b/sources/pyside2/tests/QtCore/qtimer_timeout_test.py
@@ -28,13 +28,16 @@
 
 '''Test case for timeout() signals from QTimer object.'''
 
-import unittest
 import os
 import sys
-from tempfile import mkstemp
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QTimer, SIGNAL
 from helper import UsesQCoreApplication
 
+
 class WatchDog(QObject):
     '''Exits the QCoreApplication main loop after sometime.'''
 
diff --git a/sources/pyside2/tests/QtCore/qtimezone_test.py b/sources/pyside2/tests/QtCore/qtimezone_test.py
index 3d5bd1714..3b9512bea 100644
--- a/sources/pyside2/tests/QtCore/qtimezone_test.py
+++ b/sources/pyside2/tests/QtCore/qtimezone_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QTimeZone
 import py3kcompat as py3k
 
diff --git a/sources/pyside2/tests/QtCore/repr_test.py b/sources/pyside2/tests/QtCore/repr_test.py
index 0c20c24ec..4bac44c2a 100644
--- a/sources/pyside2/tests/QtCore/repr_test.py
+++ b/sources/pyside2/tests/QtCore/repr_test.py
@@ -26,9 +26,13 @@
 ##
 #############################################################################
 
-import PySide2
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+import PySide2
 from PySide2.QtCore import QByteArray, QDate, QDateTime, QTime, QLine, QLineF
 from PySide2.QtCore import Qt, QSize, QSizeF, QRect, QRectF, QPoint, QPointF
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtCore/thread_signals_test.py b/sources/pyside2/tests/QtCore/thread_signals_test.py
index 18e289793..811d2055c 100644
--- a/sources/pyside2/tests/QtCore/thread_signals_test.py
+++ b/sources/pyside2/tests/QtCore/thread_signals_test.py
@@ -28,9 +28,11 @@
 
 ''' Test case for QObject.signalsBlocked() and blockSignal()'''
 
-import unittest
 import os
-from tempfile import mkstemp
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QObject, SIGNAL, QFile, QThread, QTimer, Qt
 from helper import UsesQCoreApplication
diff --git a/sources/pyside2/tests/QtCore/translation_test.py b/sources/pyside2/tests/QtCore/translation_test.py
index 90eda0623..758c1e277 100644
--- a/sources/pyside2/tests/QtCore/translation_test.py
+++ b/sources/pyside2/tests/QtCore/translation_test.py
@@ -32,7 +32,11 @@
 '''Unit tests to test QTranslator and translation in general.'''
 
 import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2.QtCore import QObject, QTranslator, QCoreApplication
 
diff --git a/sources/pyside2/tests/QtCore/unicode_test.py b/sources/pyside2/tests/QtCore/unicode_test.py
index 6fa169a71..3dee24f47 100644
--- a/sources/pyside2/tests/QtCore/unicode_test.py
+++ b/sources/pyside2/tests/QtCore/unicode_test.py
@@ -31,7 +31,12 @@
 
 '''Unit tests for QString conversion to/from Python Unicode'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QObject
diff --git a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
index baef03f4c..efa518eb5 100644
--- a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
+++ b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
@@ -30,10 +30,15 @@
 
 '''Test cases for QtDataVisualization'''
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQGuiApplication
 from PySide2.QtCore import QTimer
 from PySide2.QtDataVisualization import QtDataVisualization
-import unittest
 
 def dataToBarDataRow(data):
     result = []
diff --git a/sources/pyside2/tests/QtGui/bug_367.py b/sources/pyside2/tests/QtGui/bug_367.py
index 8f03d95ac..0d917e62b 100644
--- a/sources/pyside2/tests/QtGui/bug_367.py
+++ b/sources/pyside2/tests/QtGui/bug_367.py
@@ -28,8 +28,12 @@
 
 ''' Test bug 367: http://bugs.openbossa.org/show_bug.cgi?id=367'''
 
+import os
 import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2 import QtCore,QtGui
 
diff --git a/sources/pyside2/tests/QtGui/bug_660.py b/sources/pyside2/tests/QtGui/bug_660.py
index e19835a3a..f2a50fd3c 100644
--- a/sources/pyside2/tests/QtGui/bug_660.py
+++ b/sources/pyside2/tests/QtGui/bug_660.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2.QtGui import QStandardItemModel, QStandardItem
 
diff --git a/sources/pyside2/tests/QtGui/bug_740.py b/sources/pyside2/tests/QtGui/bug_740.py
index 5ea45e7f2..b01ac4a94 100644
--- a/sources/pyside2/tests/QtGui/bug_740.py
+++ b/sources/pyside2/tests/QtGui/bug_740.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from helper import UsesQApplication
 from PySide2.QtCore import QSize
diff --git a/sources/pyside2/tests/QtGui/float_to_int_implicit_conversion_test.py b/sources/pyside2/tests/QtGui/float_to_int_implicit_conversion_test.py
index ad2c043a0..e2ea09706 100644
--- a/sources/pyside2/tests/QtGui/float_to_int_implicit_conversion_test.py
+++ b/sources/pyside2/tests/QtGui/float_to_int_implicit_conversion_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QImage'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QImage, qRgb
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtGui/pyside_reload_test.py b/sources/pyside2/tests/QtGui/pyside_reload_test.py
index cd045047a..b4e98c693 100644
--- a/sources/pyside2/tests/QtGui/pyside_reload_test.py
+++ b/sources/pyside2/tests/QtGui/pyside_reload_test.py
@@ -27,9 +27,12 @@
 #############################################################################
 
 import os
-import sys
 import shutil
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 orig_path = os.path.join(os.path.dirname(__file__))
diff --git a/sources/pyside2/tests/QtGui/qcursor_test.py b/sources/pyside2/tests/QtGui/qcursor_test.py
index da41fa03a..a19b66a1d 100644
--- a/sources/pyside2/tests/QtGui/qcursor_test.py
+++ b/sources/pyside2/tests/QtGui/qcursor_test.py
@@ -30,7 +30,12 @@
 http://bugs.openbossa.org/show_bug.cgi?id=630
 '''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QBitmap, QCursor, QPixmap
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
index bc25be308..e6307a6ed 100644
--- a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
+++ b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
@@ -28,8 +28,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QDataStream, QByteArray, QIODevice, Qt
 from PySide2.QtGui import QPixmap, QColor
diff --git a/sources/pyside2/tests/QtGui/qfontmetrics_test.py b/sources/pyside2/tests/QtGui/qfontmetrics_test.py
index 4390678bb..012b9af84 100644
--- a/sources/pyside2/tests/QtGui/qfontmetrics_test.py
+++ b/sources/pyside2/tests/QtGui/qfontmetrics_test.py
@@ -29,7 +29,12 @@
 '''Tests for inject codes and modifications on QFontMetrics
    and QFontMetricsF'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QFont, QFontMetrics, QFontMetricsF
 from PySide2.QtCore import QRect, QRectF, Qt, QSize, QSizeF
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtGui/qicon_test.py b/sources/pyside2/tests/QtGui/qicon_test.py
index 3dab7c814..42b3f48fa 100644
--- a/sources/pyside2/tests/QtGui/qicon_test.py
+++ b/sources/pyside2/tests/QtGui/qicon_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import TimedQApplication
 from PySide2.QtGui import QIcon
 
diff --git a/sources/pyside2/tests/QtGui/qitemselection_test.py b/sources/pyside2/tests/QtGui/qitemselection_test.py
index e77813db1..6c1d7d07f 100644
--- a/sources/pyside2/tests/QtGui/qitemselection_test.py
+++ b/sources/pyside2/tests/QtGui/qitemselection_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import QItemSelection
 from PySide2.QtGui import QStandardItemModel
diff --git a/sources/pyside2/tests/QtGui/qkeysequence_test.py b/sources/pyside2/tests/QtGui/qkeysequence_test.py
index a1a0d11d5..1a815c6d7 100644
--- a/sources/pyside2/tests/QtGui/qkeysequence_test.py
+++ b/sources/pyside2/tests/QtGui/qkeysequence_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import Qt
 from PySide2.QtGui import QKeySequence
 
diff --git a/sources/pyside2/tests/QtGui/qopenglbuffer_test.py b/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
index eb11dc0b9..b05079d74 100644
--- a/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
+++ b/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
@@ -28,9 +28,12 @@
 
 '''Unit tests for QOpenGLBuffer'''
 
-import unittest
 import ctypes
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from helper import UsesQApplication
 from PySide2.QtGui import QOpenGLBuffer
diff --git a/sources/pyside2/tests/QtGui/qopenglwindow_test.py b/sources/pyside2/tests/QtGui/qopenglwindow_test.py
index b20db90b6..2f846265e 100644
--- a/sources/pyside2/tests/QtGui/qopenglwindow_test.py
+++ b/sources/pyside2/tests/QtGui/qopenglwindow_test.py
@@ -28,9 +28,12 @@
 
 '''Unit test for QOpenGLContext, QOpenGLTexture, QOpenGLWindow and related classes'''
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtCore import QSize, QTimer, Qt
diff --git a/sources/pyside2/tests/QtGui/qpdfwriter_test.py b/sources/pyside2/tests/QtGui/qpdfwriter_test.py
index da00ff0c9..2ee748194 100644
--- a/sources/pyside2/tests/QtGui/qpdfwriter_test.py
+++ b/sources/pyside2/tests/QtGui/qpdfwriter_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtGui import QPageLayout, QPageSize, QPdfWriter, QTextDocument
 from PySide2.QtCore import QDir, QMarginsF, QTemporaryFile
diff --git a/sources/pyside2/tests/QtGui/qpixelformat_test.py b/sources/pyside2/tests/QtGui/qpixelformat_test.py
index 563f36cdf..5689ca0e0 100644
--- a/sources/pyside2/tests/QtGui/qpixelformat_test.py
+++ b/sources/pyside2/tests/QtGui/qpixelformat_test.py
@@ -28,8 +28,12 @@
 
 '''Unit test for QPixelFormat'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import QSize, Qt
 from PySide2.QtGui import QColor, QImage, QPixelFormat
diff --git a/sources/pyside2/tests/QtGui/qpixmap_test.py b/sources/pyside2/tests/QtGui/qpixmap_test.py
index 8f853a38a..575abb096 100644
--- a/sources/pyside2/tests/QtGui/qpixmap_test.py
+++ b/sources/pyside2/tests/QtGui/qpixmap_test.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
-import os
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtGui import *
 from PySide2.QtCore import *
diff --git a/sources/pyside2/tests/QtGui/qpixmapcache_test.py b/sources/pyside2/tests/QtGui/qpixmapcache_test.py
index 7a2073b12..d10dff36f 100644
--- a/sources/pyside2/tests/QtGui/qpixmapcache_test.py
+++ b/sources/pyside2/tests/QtGui/qpixmapcache_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtGui import QPixmapCache, QPixmap
 
diff --git a/sources/pyside2/tests/QtGui/qrasterwindow_test.py b/sources/pyside2/tests/QtGui/qrasterwindow_test.py
index 887982111..bd1cf24ff 100644
--- a/sources/pyside2/tests/QtGui/qrasterwindow_test.py
+++ b/sources/pyside2/tests/QtGui/qrasterwindow_test.py
@@ -28,8 +28,12 @@
 
 '''Unit test for QBackingStore, QRasterWindow and QStaticText'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import QEvent, QPoint, QRect, QSize, QTimer, Qt
 from PySide2.QtGui import QColor, QBackingStore, QPaintDevice, QPainter, QWindow, QPaintDeviceWindow, QRasterWindow, QRegion, QStaticText
diff --git a/sources/pyside2/tests/QtGui/qregion_test.py b/sources/pyside2/tests/QtGui/qregion_test.py
index 72cec4bd5..beb622e6c 100644
--- a/sources/pyside2/tests/QtGui/qregion_test.py
+++ b/sources/pyside2/tests/QtGui/qregion_test.py
@@ -26,8 +26,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtGui import QRegion
 from PySide2.QtCore import QPoint
diff --git a/sources/pyside2/tests/QtGui/qstylehints_test.py b/sources/pyside2/tests/QtGui/qstylehints_test.py
index 1623bf746..8f10005a9 100644
--- a/sources/pyside2/tests/QtGui/qstylehints_test.py
+++ b/sources/pyside2/tests/QtGui/qstylehints_test.py
@@ -28,8 +28,12 @@
 
 '''Unit test for QStyleHints'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtGui import QStyleHints
 
diff --git a/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py b/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py
index b9d87ff2b..f13ba884e 100644
--- a/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py
+++ b/sources/pyside2/tests/QtGui/qtextdocumentwriter_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QTextDocumentWriter, QTextDocument
 from PySide2.QtCore import QBuffer
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtGui/qtextline_test.py b/sources/pyside2/tests/QtGui/qtextline_test.py
index b7d308889..b4185f05f 100644
--- a/sources/pyside2/tests/QtGui/qtextline_test.py
+++ b/sources/pyside2/tests/QtGui/qtextline_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QTextLayout
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtGui/timed_app_and_patching_test.py b/sources/pyside2/tests/QtGui/timed_app_and_patching_test.py
index 014aeec1a..1b33c6ff5 100644
--- a/sources/pyside2/tests/QtGui/timed_app_and_patching_test.py
+++ b/sources/pyside2/tests/QtGui/timed_app_and_patching_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import TimedQApplication
 from PySide2.support import deprecated
 from PySide2.support.signature import importhandler
diff --git a/sources/pyside2/tests/QtHelp/help_test.py b/sources/pyside2/tests/QtHelp/help_test.py
index 0acd9d7b9..54d5365b3 100644
--- a/sources/pyside2/tests/QtHelp/help_test.py
+++ b/sources/pyside2/tests/QtHelp/help_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtHelp import QHelpEngine
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtHelp/helpsearchengine_test.py b/sources/pyside2/tests/QtHelp/helpsearchengine_test.py
index 0e2ace02e..69a7c5bfd 100644
--- a/sources/pyside2/tests/QtHelp/helpsearchengine_test.py
+++ b/sources/pyside2/tests/QtHelp/helpsearchengine_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtHelp import QHelpEngineCore, QHelpSearchEngine, QHelpSearchResult
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtMultimedia/audio_test.py b/sources/pyside2/tests/QtMultimedia/audio_test.py
index 78c254ff9..2bcc7043d 100644
--- a/sources/pyside2/tests/QtMultimedia/audio_test.py
+++ b/sources/pyside2/tests/QtMultimedia/audio_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QHttp'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQGuiApplication
 from PySide2.QtCore import *
 from PySide2.QtMultimedia import *
diff --git a/sources/pyside2/tests/QtMultimediaWidgets/qmultimediawidgets.py b/sources/pyside2/tests/QtMultimediaWidgets/qmultimediawidgets.py
index 5e99c8ade..bf36ebe7e 100644
--- a/sources/pyside2/tests/QtMultimediaWidgets/qmultimediawidgets.py
+++ b/sources/pyside2/tests/QtMultimediaWidgets/qmultimediawidgets.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QtMultimediaWidgets'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtMultimediaWidgets import QGraphicsVideoItem, QVideoWidget
 from PySide2.QtWidgets import QGraphicsScene, QGraphicsView, QVBoxLayout, QWidget
diff --git a/sources/pyside2/tests/QtNetwork/accessManager_test.py b/sources/pyside2/tests/QtNetwork/accessManager_test.py
index 6c452844e..81c6989c0 100644
--- a/sources/pyside2/tests/QtNetwork/accessManager_test.py
+++ b/sources/pyside2/tests/QtNetwork/accessManager_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QHttp'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from PySide2.QtNetwork import *
 
diff --git a/sources/pyside2/tests/QtNetwork/bug_1084.py b/sources/pyside2/tests/QtNetwork/bug_1084.py
index e9d31eae9..947ba1466 100644
--- a/sources/pyside2/tests/QtNetwork/bug_1084.py
+++ b/sources/pyside2/tests/QtNetwork/bug_1084.py
@@ -28,7 +28,12 @@
 
 ''' unit test for BUG #1084 '''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtNetwork
 import py3kcompat as py3k
 
diff --git a/sources/pyside2/tests/QtNetwork/bug_446.py b/sources/pyside2/tests/QtNetwork/bug_446.py
index 4fcda65b7..31e34d23f 100644
--- a/sources/pyside2/tests/QtNetwork/bug_446.py
+++ b/sources/pyside2/tests/QtNetwork/bug_446.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from PySide2.QtNetwork import *
 
diff --git a/sources/pyside2/tests/QtNetwork/udpsocket_test.py b/sources/pyside2/tests/QtNetwork/udpsocket_test.py
index ea4f5c8f6..fc7f7b0d2 100644
--- a/sources/pyside2/tests/QtNetwork/udpsocket_test.py
+++ b/sources/pyside2/tests/QtNetwork/udpsocket_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QUdpSocket'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QUrl, QObject, SIGNAL, QCoreApplication, QTimer
 from PySide2.QtNetwork import QUdpSocket, QHostAddress
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
index 07e028eff..7407a9de2 100644
--- a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
+++ b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
@@ -30,8 +30,12 @@
 
 '''Unit tests for QGLBuffer'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QByteArray
 from PySide2.QtOpenGL import QGLBuffer, QGLWidget
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtPrintSupport/bug_500.py b/sources/pyside2/tests/QtPrintSupport/bug_500.py
index 824a9c893..a7153bbb0 100644
--- a/sources/pyside2/tests/QtPrintSupport/bug_500.py
+++ b/sources/pyside2/tests/QtPrintSupport/bug_500.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from PySide2.QtPrintSupport import *
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py b/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py
index 48e637bcd..62e2f91fc 100644
--- a/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py
+++ b/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py
@@ -28,7 +28,12 @@
 
 from __future__ import print_function
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QTextCursor
 from PySide2.QtPrintSupport import QPrinter, QPrinterInfo
 from PySide2.QtWidgets import QLayout, QWidget, QGraphicsLayout, QGraphicsLayoutItem
diff --git a/sources/pyside2/tests/QtQml/bug_451.py b/sources/pyside2/tests/QtQml/bug_451.py
index 5a6df7ff2..b6d1da5d0 100644
--- a/sources/pyside2/tests/QtQml/bug_451.py
+++ b/sources/pyside2/tests/QtQml/bug_451.py
@@ -33,9 +33,12 @@ An archive of said bug:
 https://srinikom.github.io/pyside-bz-archive/451.html
 '''
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 
 from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/bug_456.py b/sources/pyside2/tests/QtQml/bug_456.py
index 9c94e76a6..7ac2f21c2 100644
--- a/sources/pyside2/tests/QtQml/bug_456.py
+++ b/sources/pyside2/tests/QtQml/bug_456.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 
 from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/bug_557.py b/sources/pyside2/tests/QtQml/bug_557.py
index bc18ba2a2..a697bcd07 100644
--- a/sources/pyside2/tests/QtQml/bug_557.py
+++ b/sources/pyside2/tests/QtQml/bug_557.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 
 from PySide2.QtCore import QUrl
diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py
index 20fa4d196..e4854eab0 100644
--- a/sources/pyside2/tests/QtQml/bug_726.py
+++ b/sources/pyside2/tests/QtQml/bug_726.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 
 from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/bug_814.py b/sources/pyside2/tests/QtQml/bug_814.py
index 31eada2df..5387cd1f5 100644
--- a/sources/pyside2/tests/QtQml/bug_814.py
+++ b/sources/pyside2/tests/QtQml/bug_814.py
@@ -37,8 +37,12 @@
 # 2011-04-08 Thomas Perl <m@thp.io>
 # Released under the same terms as PySide itself
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 
 from PySide2.QtCore import QUrl, QAbstractListModel, QModelIndex, Qt
diff --git a/sources/pyside2/tests/QtQml/bug_825.py b/sources/pyside2/tests/QtQml/bug_825.py
index fe67f64b9..4592a0f24 100644
--- a/sources/pyside2/tests/QtQml/bug_825.py
+++ b/sources/pyside2/tests/QtQml/bug_825.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 
 from PySide2.QtCore import Qt, QUrl, QTimer
diff --git a/sources/pyside2/tests/QtQml/bug_847.py b/sources/pyside2/tests/QtQml/bug_847.py
index c38278537..b88bffefb 100644
--- a/sources/pyside2/tests/QtQml/bug_847.py
+++ b/sources/pyside2/tests/QtQml/bug_847.py
@@ -36,8 +36,12 @@
 
 from __future__ import print_function
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, UsesQApplication
 
 from PySide2.QtCore import Slot, Signal, QUrl, QTimer, QCoreApplication
diff --git a/sources/pyside2/tests/QtQml/bug_915.py b/sources/pyside2/tests/QtQml/bug_915.py
index b0f231aee..5e80fcc2f 100644
--- a/sources/pyside2/tests/QtQml/bug_915.py
+++ b/sources/pyside2/tests/QtQml/bug_915.py
@@ -29,8 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import TimedQApplication
 
 from PySide2.QtQuick import QQuickView, QQuickItem
diff --git a/sources/pyside2/tests/QtQml/bug_926.py b/sources/pyside2/tests/QtQml/bug_926.py
index 6eef7b1a7..865e61129 100644
--- a/sources/pyside2/tests/QtQml/bug_926.py
+++ b/sources/pyside2/tests/QtQml/bug_926.py
@@ -27,8 +27,12 @@
 #############################################################################
 
 import sys
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 
 from PySide2.QtCore import QUrl, QTimer, QObject, Signal, Property
diff --git a/sources/pyside2/tests/QtQml/bug_951.py b/sources/pyside2/tests/QtQml/bug_951.py
index 38cf597ef..16399e62b 100644
--- a/sources/pyside2/tests/QtQml/bug_951.py
+++ b/sources/pyside2/tests/QtQml/bug_951.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 
 from PySide2.QtCore import QUrl
diff --git a/sources/pyside2/tests/QtQml/bug_995.py b/sources/pyside2/tests/QtQml/bug_995.py
index 7363f0e1b..2ffc38c9e 100644
--- a/sources/pyside2/tests/QtQml/bug_995.py
+++ b/sources/pyside2/tests/QtQml/bug_995.py
@@ -26,6 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, UsesQApplication
 
 from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/bug_997.py b/sources/pyside2/tests/QtQml/bug_997.py
index 45c777f8b..fdb6c6c8d 100644
--- a/sources/pyside2/tests/QtQml/bug_997.py
+++ b/sources/pyside2/tests/QtQml/bug_997.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, UsesQApplication
 
 from PySide2 import QtCore, QtQml, QtQuick
diff --git a/sources/pyside2/tests/QtQml/connect_python_qml.py b/sources/pyside2/tests/QtQml/connect_python_qml.py
index e2fedaa3e..6e265ae3c 100644
--- a/sources/pyside2/tests/QtQml/connect_python_qml.py
+++ b/sources/pyside2/tests/QtQml/connect_python_qml.py
@@ -33,8 +33,12 @@ archive:
 https://srinikom.github.io/pyside-bz-archive/442.html
 '''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 
 from PySide2 import QtCore, QtGui, QtQuick
diff --git a/sources/pyside2/tests/QtQml/javascript_exceptions.py b/sources/pyside2/tests/QtQml/javascript_exceptions.py
index 3e22a91c7..fc7aba205 100644
--- a/sources/pyside2/tests/QtQml/javascript_exceptions.py
+++ b/sources/pyside2/tests/QtQml/javascript_exceptions.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, UsesQApplication
 
 from PySide2.QtCore import Slot, Property, Signal, QObject, QUrl
diff --git a/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py b/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
index 08806a4a4..9adcdcaf7 100644
--- a/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
+++ b/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
@@ -29,8 +29,12 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 
 from PySide2.QtCore import QObject, QUrl, Slot, QTimer
diff --git a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
index 3e6d1c2aa..74c87eac5 100644
--- a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
+++ b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
@@ -30,8 +30,12 @@
 
 from __future__ import print_function
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QUrl
 from PySide2.QtQuick import QQuickView
 from PySide2.QtQml import QQmlNetworkAccessManagerFactory
diff --git a/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py b/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
index 19b982c67..8e7e07997 100644
--- a/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
+++ b/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 from PySide2 import QtCore, QtGui, QtQuick
 
diff --git a/sources/pyside2/tests/QtQml/qquickview_test.py b/sources/pyside2/tests/QtQml/qquickview_test.py
index 62b20738f..6edaf64e0 100644
--- a/sources/pyside2/tests/QtQml/qquickview_test.py
+++ b/sources/pyside2/tests/QtQml/qquickview_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QQuickView'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 
 from PySide2.QtCore import QUrl, QObject, Property, Slot
diff --git a/sources/pyside2/tests/QtQml/registertype.py b/sources/pyside2/tests/QtQml/registertype.py
index 5be65b7bd..32d93830e 100644
--- a/sources/pyside2/tests/QtQml/registertype.py
+++ b/sources/pyside2/tests/QtQml/registertype.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import helper
 
 from PySide2.QtCore import Property, QTimer, QUrl
diff --git a/sources/pyside2/tests/QtQml/signal_arguments.py b/sources/pyside2/tests/QtQml/signal_arguments.py
index 096fa6882..d527e72e1 100644
--- a/sources/pyside2/tests/QtQml/signal_arguments.py
+++ b/sources/pyside2/tests/QtQml/signal_arguments.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename, TimedQApplication
 from PySide2.QtQuick import QQuickView
 from PySide2.QtCore import QObject, Signal, Slot, QUrl, QTimer, Property
diff --git a/sources/pyside2/tests/QtScript/qscriptvalue_test.py b/sources/pyside2/tests/QtScript/qscriptvalue_test.py
index 11a763cc4..4b2365751 100644
--- a/sources/pyside2/tests/QtScript/qscriptvalue_test.py
+++ b/sources/pyside2/tests/QtScript/qscriptvalue_test.py
@@ -28,8 +28,12 @@
 
 from __future__ import print_function
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtScript import *
 
 # Required for eval() to work
diff --git a/sources/pyside2/tests/QtScriptTools/debugger_test.py b/sources/pyside2/tests/QtScriptTools/debugger_test.py
index bcb73c13f..eed26bd20 100644
--- a/sources/pyside2/tests/QtScriptTools/debugger_test.py
+++ b/sources/pyside2/tests/QtScriptTools/debugger_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import SIGNAL, QTimer
 from PySide2.QtScript import QScriptEngine
 from PySide2.QtScriptTools import QScriptEngineDebugger
diff --git a/sources/pyside2/tests/QtScxml/test_dynamic.py b/sources/pyside2/tests/QtScxml/test_dynamic.py
index 1bae534ac..d0851c714 100644
--- a/sources/pyside2/tests/QtScxml/test_dynamic.py
+++ b/sources/pyside2/tests/QtScxml/test_dynamic.py
@@ -27,8 +27,11 @@
 #############################################################################
 
 import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import TimedQApplication
 from PySide2.QtCore import QObject, SIGNAL
 from PySide2.QtScxml import QScxmlStateMachine
diff --git a/sources/pyside2/tests/QtSql/qvarianttype_test.py b/sources/pyside2/tests/QtSql/qvarianttype_test.py
index 002b05069..266cafa22 100644
--- a/sources/pyside2/tests/QtSql/qvarianttype_test.py
+++ b/sources/pyside2/tests/QtSql/qvarianttype_test.py
@@ -27,7 +27,12 @@
 #############################################################################
 
 '''Test cases for QVariant::Type converter'''
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2.QtSql import QSqlField
 
diff --git a/sources/pyside2/tests/QtTest/click_test.py b/sources/pyside2/tests/QtTest/click_test.py
index c03c42ddd..64a3513cc 100644
--- a/sources/pyside2/tests/QtTest/click_test.py
+++ b/sources/pyside2/tests/QtTest/click_test.py
@@ -28,8 +28,12 @@
 
 '''QtTest mouse click functionalities'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import Qt, QObject
 from PySide2.QtWidgets import QPushButton, QLineEdit
 from PySide2.QtTest import QTest
diff --git a/sources/pyside2/tests/QtTest/eventfilter_test.py b/sources/pyside2/tests/QtTest/eventfilter_test.py
index f69f85ac0..d478d143c 100644
--- a/sources/pyside2/tests/QtTest/eventfilter_test.py
+++ b/sources/pyside2/tests/QtTest/eventfilter_test.py
@@ -28,8 +28,12 @@
 
 '''Tests for QKeyEvent'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import Qt, QObject, QEvent
 from PySide2.QtGui import QKeyEvent
 from PySide2.QtWidgets import QLineEdit
diff --git a/sources/pyside2/tests/QtTest/qvalidator_test.py b/sources/pyside2/tests/QtTest/qvalidator_test.py
index 408f14f6e..f6a0fee9a 100644
--- a/sources/pyside2/tests/QtTest/qvalidator_test.py
+++ b/sources/pyside2/tests/QtTest/qvalidator_test.py
@@ -26,12 +26,17 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 from PySide2.QtTest import *
 
-import unittest
 from helper import UsesQApplication
 
 class MyValidator1(QValidator):
diff --git a/sources/pyside2/tests/QtTest/touchevent_test.py b/sources/pyside2/tests/QtTest/touchevent_test.py
index 1fa8adc60..641d2e917 100644
--- a/sources/pyside2/tests/QtTest/touchevent_test.py
+++ b/sources/pyside2/tests/QtTest/touchevent_test.py
@@ -26,15 +26,19 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from helper import UsesQApplication
+
 from PySide2.QtWidgets import QWidget
 from PySide2.QtCore import QPoint, QTimer, Qt, QEvent
 from PySide2.QtGui import QTouchDevice
 from PySide2.QtTest import QTest
 
-import unittest
-
-from helper import UsesQApplication
-
 class MyWidget(QWidget):
     def __init__(self, parent = None):
         QWidget.__init__(self, parent)
diff --git a/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py b/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py
index 69ffed26b..5294f609c 100644
--- a/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py
+++ b/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py
@@ -30,10 +30,14 @@
 
 '''Test cases for QTextToSpeech methods'''
 
-from helper import UsesQApplication
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from helper import UsesQApplication
+
 from PySide2.QtCore import QTimer
 
 try:
diff --git a/sources/pyside2/tests/QtUiTools/bug_1060.py b/sources/pyside2/tests/QtUiTools/bug_1060.py
index 94c15b54d..92736d785 100644
--- a/sources/pyside2/tests/QtUiTools/bug_1060.py
+++ b/sources/pyside2/tests/QtUiTools/bug_1060.py
@@ -28,9 +28,15 @@
 
 ''' unit test for BUG #1060 '''
 
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from helper import adjust_filename
 from PySide2.QtWidgets import QApplication
 from PySide2.QtUiTools import QUiLoader
-from helper import adjust_filename
+
 
 class MyQUiLoader(QUiLoader):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtUiTools/bug_360.py b/sources/pyside2/tests/QtUiTools/bug_360.py
index 345c4f95e..4043c88ae 100644
--- a/sources/pyside2/tests/QtUiTools/bug_360.py
+++ b/sources/pyside2/tests/QtUiTools/bug_360.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
-import unittest
 import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2 import QtCore, QtWidgets
diff --git a/sources/pyside2/tests/QtUiTools/bug_376.py b/sources/pyside2/tests/QtUiTools/bug_376.py
index f26177ab4..a40f9c2ac 100644
--- a/sources/pyside2/tests/QtUiTools/bug_376.py
+++ b/sources/pyside2/tests/QtUiTools/bug_376.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
-import unittest
 import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2 import QtCore, QtWidgets
diff --git a/sources/pyside2/tests/QtUiTools/bug_392.py b/sources/pyside2/tests/QtUiTools/bug_392.py
index 9e8648135..f5d096e75 100644
--- a/sources/pyside2/tests/QtUiTools/bug_392.py
+++ b/sources/pyside2/tests/QtUiTools/bug_392.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
-import unittest
 import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2 import QtWidgets
diff --git a/sources/pyside2/tests/QtUiTools/bug_552.py b/sources/pyside2/tests/QtUiTools/bug_552.py
index b9d4f750b..c395b37d1 100644
--- a/sources/pyside2/tests/QtUiTools/bug_552.py
+++ b/sources/pyside2/tests/QtUiTools/bug_552.py
@@ -26,6 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 from PySide2 import QtWidgets, QtCore
 from PySide2.QtUiTools import QUiLoader
diff --git a/sources/pyside2/tests/QtUiTools/bug_797.py b/sources/pyside2/tests/QtUiTools/bug_797.py
index b1a0e5bb3..487645416 100644
--- a/sources/pyside2/tests/QtUiTools/bug_797.py
+++ b/sources/pyside2/tests/QtUiTools/bug_797.py
@@ -26,10 +26,18 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from helper import adjust_filename
+
 from PySide2 import QtUiTools
 from PySide2 import QtCore
 from PySide2 import QtWidgets
-from helper import adjust_filename
+
 
 app = QtWidgets.QApplication([])
 loader = QtUiTools.QUiLoader()
diff --git a/sources/pyside2/tests/QtUiTools/bug_909.py b/sources/pyside2/tests/QtUiTools/bug_909.py
index c4185e11f..822dcba29 100644
--- a/sources/pyside2/tests/QtUiTools/bug_909.py
+++ b/sources/pyside2/tests/QtUiTools/bug_909.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QFile
 from PySide2.QtWidgets import QTabWidget
 from PySide2.QtUiTools import QUiLoader
diff --git a/sources/pyside2/tests/QtUiTools/bug_913.py b/sources/pyside2/tests/QtUiTools/bug_913.py
index 9ace5bbef..9d2331a8a 100644
--- a/sources/pyside2/tests/QtUiTools/bug_913.py
+++ b/sources/pyside2/tests/QtUiTools/bug_913.py
@@ -29,8 +29,12 @@
 ##
 #############################################################################
 
+import os
 import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import adjust_filename
 
 from PySide2.QtCore import *
diff --git a/sources/pyside2/tests/QtUiTools/bug_958.py b/sources/pyside2/tests/QtUiTools/bug_958.py
index 503433405..0ffea229c 100644
--- a/sources/pyside2/tests/QtUiTools/bug_958.py
+++ b/sources/pyside2/tests/QtUiTools/bug_958.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtWidgets, QtUiTools
 from helper import adjust_filename
 from helper import TimedQApplication
diff --git a/sources/pyside2/tests/QtUiTools/bug_965.py b/sources/pyside2/tests/QtUiTools/bug_965.py
index b0df5fc71..707a1bb6a 100644
--- a/sources/pyside2/tests/QtUiTools/bug_965.py
+++ b/sources/pyside2/tests/QtUiTools/bug_965.py
@@ -27,8 +27,12 @@
 #############################################################################
 
 from PySide2.QtUiTools import QUiLoader
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from helper import adjust_filename
 
diff --git a/sources/pyside2/tests/QtUiTools/ui_test.py b/sources/pyside2/tests/QtUiTools/ui_test.py
index f84f9c3d1..d67c9b007 100644
--- a/sources/pyside2/tests/QtUiTools/ui_test.py
+++ b/sources/pyside2/tests/QtUiTools/ui_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtUiTools import QUiLoader
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtUiTools/uiloader_test.py b/sources/pyside2/tests/QtUiTools/uiloader_test.py
index c550b8020..004f2dc56 100644
--- a/sources/pyside2/tests/QtUiTools/uiloader_test.py
+++ b/sources/pyside2/tests/QtUiTools/uiloader_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
-import unittest
 import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtWidgets import QWidget
diff --git a/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py b/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py
index 8da2b45f8..1117b553e 100644
--- a/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py
+++ b/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py
@@ -28,8 +28,12 @@
 
 from __future__ import print_function
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QBuffer, QTimer
 from PySide2.QtWidgets import QApplication
 from PySide2.QtWebEngineWidgets import QWebEngineView, QWebEngineProfile
diff --git a/sources/pyside2/tests/QtWebKit/bug_899.py b/sources/pyside2/tests/QtWebKit/bug_899.py
index 817aeb6d5..ad6fc68ba 100644
--- a/sources/pyside2/tests/QtWebKit/bug_899.py
+++ b/sources/pyside2/tests/QtWebKit/bug_899.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import Property, QObject
 from PySide2.QtWebKit import QWebView
 from helper import TimedQApplication
diff --git a/sources/pyside2/tests/QtWebKit/bug_959.py b/sources/pyside2/tests/QtWebKit/bug_959.py
index 2ebfdbe99..6750acff2 100644
--- a/sources/pyside2/tests/QtWebKit/bug_959.py
+++ b/sources/pyside2/tests/QtWebKit/bug_959.py
@@ -31,9 +31,12 @@ from PySide2.QtWebKit import QWebView
 from PySide2.QtWidgets import QApplication
 from PySide2 import QtCore
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 functionID = -1
diff --git a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
index 586185418..6002884f2 100644
--- a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
+++ b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
@@ -30,6 +30,8 @@ import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QUrl, QTimer
 from PySide2.QtWidgets import QApplication, QLabel
 from PySide2.QtWebKit import QWebPluginFactory, QWebView, QWebSettings
diff --git a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
index e98de7b87..d6bd52a3c 100644
--- a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
+++ b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import Property, QObject
 from PySide2.QtWebKit import QWebView
 from helper import TimedQApplication
diff --git a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
index b49fe13dd..b8f21d48f 100644
--- a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
+++ b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
@@ -29,7 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore, QtWebKit
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWebKit/webframe_test.py b/sources/pyside2/tests/QtWebKit/webframe_test.py
index 4aea6709a..455d0a8e7 100644
--- a/sources/pyside2/tests/QtWebKit/webframe_test.py
+++ b/sources/pyside2/tests/QtWebKit/webframe_test.py
@@ -26,8 +26,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QObject, SIGNAL, QUrl
 from PySide2.QtWebKit import *
diff --git a/sources/pyside2/tests/QtWebKit/webpage_test.py b/sources/pyside2/tests/QtWebKit/webpage_test.py
index 95cd307d5..3ed6fa89d 100644
--- a/sources/pyside2/tests/QtWebKit/webpage_test.py
+++ b/sources/pyside2/tests/QtWebKit/webpage_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QWebPage'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL, QUrl
 from PySide2.QtWebKit import QWebPage
 from PySide2.QtNetwork import QNetworkAccessManager
diff --git a/sources/pyside2/tests/QtWebKit/webview_test.py b/sources/pyside2/tests/QtWebKit/webview_test.py
index ce7a3a7bf..50f20c40d 100644
--- a/sources/pyside2/tests/QtWebKit/webview_test.py
+++ b/sources/pyside2/tests/QtWebKit/webview_test.py
@@ -28,9 +28,13 @@
 
 '''Test cases for QWebView'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
-import sys
 
 from PySide2.QtCore import QObject, SIGNAL, QUrl
 from PySide2.QtWebKit import QWebPage, QWebView
diff --git a/sources/pyside2/tests/QtWidgets/action_clear.py b/sources/pyside2/tests/QtWidgets/action_clear.py
index e7bd882bc..2e9c8c720 100644
--- a/sources/pyside2/tests/QtWidgets/action_clear.py
+++ b/sources/pyside2/tests/QtWidgets/action_clear.py
@@ -26,10 +26,14 @@
 ##
 #############################################################################
 
-from PySide2.QtWidgets import QMenu, QWidget, QMenuBar, QToolBar
+import os
+import sys
+import unittest
 import weakref
 
-import unittest
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
+from PySide2.QtWidgets import QMenu, QWidget, QMenuBar, QToolBar
 from helper import UsesQApplication
 
 
diff --git a/sources/pyside2/tests/QtWidgets/add_action_test.py b/sources/pyside2/tests/QtWidgets/add_action_test.py
index 852bcc130..9fdeccd27 100644
--- a/sources/pyside2/tests/QtWidgets/add_action_test.py
+++ b/sources/pyside2/tests/QtWidgets/add_action_test.py
@@ -28,8 +28,12 @@
 
 '''Tests for QMenuBar.addAction(identifier, callback) calls'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import SLOT
 from PySide2.QtWidgets import QMenuBar, QAction, QPushButton
 
diff --git a/sources/pyside2/tests/QtWidgets/api2_test.py b/sources/pyside2/tests/QtWidgets/api2_test.py
index 90ad4eb00..27fdbcdda 100644
--- a/sources/pyside2/tests/QtWidgets/api2_test.py
+++ b/sources/pyside2/tests/QtWidgets/api2_test.py
@@ -31,8 +31,11 @@
 '''Test cases for PySide API2 support'''
 
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtGui import QIntValidator, QValidator
 from PySide2.QtWidgets import QWidget, QSpinBox, QApplication
diff --git a/sources/pyside2/tests/QtWidgets/bug_1002.py b/sources/pyside2/tests/QtWidgets/bug_1002.py
index e4f5bf75d..d05317dfd 100644
--- a/sources/pyside2/tests/QtWidgets/bug_1002.py
+++ b/sources/pyside2/tests/QtWidgets/bug_1002.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QWidget, QPushButton
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/bug_1006.py b/sources/pyside2/tests/QtWidgets/bug_1006.py
index 49dc22cfd..f8a85303f 100644
--- a/sources/pyside2/tests/QtWidgets/bug_1006.py
+++ b/sources/pyside2/tests/QtWidgets/bug_1006.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 import weakref
-import sys
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QDialog, QLabel, QGridLayout, QHBoxLayout, QWidget
diff --git a/sources/pyside2/tests/QtWidgets/bug_363.py b/sources/pyside2/tests/QtWidgets/bug_363.py
index 642c719e7..0e15eb5bd 100644
--- a/sources/pyside2/tests/QtWidgets/bug_363.py
+++ b/sources/pyside2/tests/QtWidgets/bug_363.py
@@ -28,9 +28,12 @@
 
 ''' Test bug 363: http://bugs.openbossa.org/show_bug.cgi?id=363'''
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2 import QtCore, QtWidgets
 
diff --git a/sources/pyside2/tests/QtWidgets/bug_389.py b/sources/pyside2/tests/QtWidgets/bug_389.py
index d29b6d523..ca4b01521 100644
--- a/sources/pyside2/tests/QtWidgets/bug_389.py
+++ b/sources/pyside2/tests/QtWidgets/bug_389.py
@@ -29,7 +29,11 @@
 ''' Test bug 389: http://bugs.openbossa.org/show_bug.cgi?id=389'''
 
 import sys
+import os
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2 import QtCore, QtGui, QtWidgets
 
diff --git a/sources/pyside2/tests/QtWidgets/bug_400.py b/sources/pyside2/tests/QtWidgets/bug_400.py
index 64e0231d9..f696c9f8f 100644
--- a/sources/pyside2/tests/QtWidgets/bug_400.py
+++ b/sources/pyside2/tests/QtWidgets/bug_400.py
@@ -28,7 +28,12 @@
 
 ''' Test bug 400: http://bugs.openbossa.org/show_bug.cgi?id=400'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtWidgets import QTreeWidgetItemIterator, QTreeWidgetItem, QTreeWidget
 
diff --git a/sources/pyside2/tests/QtWidgets/bug_416.py b/sources/pyside2/tests/QtWidgets/bug_416.py
index ea8a7c14d..f15cff508 100644
--- a/sources/pyside2/tests/QtWidgets/bug_416.py
+++ b/sources/pyside2/tests/QtWidgets/bug_416.py
@@ -28,7 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import TimedQApplication
 from PySide2.QtCore import QSignalTransition, QState, Qt, QStateMachine
 from PySide2.QtWidgets import QCheckBox
diff --git a/sources/pyside2/tests/QtWidgets/bug_467.py b/sources/pyside2/tests/QtWidgets/bug_467.py
index 0a207f1a7..2eb29e08e 100644
--- a/sources/pyside2/tests/QtWidgets/bug_467.py
+++ b/sources/pyside2/tests/QtWidgets/bug_467.py
@@ -28,7 +28,12 @@
 
 ''' Test bug 367: http://bugs.openbossa.org/show_bug.cgi?id=467'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtWidgets import QMainWindow, QApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/bug_512.py b/sources/pyside2/tests/QtWidgets/bug_512.py
index 4815c2d86..cb5f62b76 100644
--- a/sources/pyside2/tests/QtWidgets/bug_512.py
+++ b/sources/pyside2/tests/QtWidgets/bug_512.py
@@ -28,7 +28,12 @@
 
 ''' Test bug 512: http://bugs.openbossa.org/show_bug.cgi?id=512'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import *
 from PySide2.QtWidgets import *
diff --git a/sources/pyside2/tests/QtWidgets/bug_688.py b/sources/pyside2/tests/QtWidgets/bug_688.py
index 2bab2050a..32e6bf313 100644
--- a/sources/pyside2/tests/QtWidgets/bug_688.py
+++ b/sources/pyside2/tests/QtWidgets/bug_688.py
@@ -28,7 +28,12 @@
 
 ''' Test bug 688: http://bugs.openbossa.org/show_bug.cgi?id=688'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtGui import QTextFrame, QTextCursor, QTextCharFormat, QFont, QTextFrameFormat
 from PySide2.QtWidgets import QTextEdit
diff --git a/sources/pyside2/tests/QtWidgets/bug_696.py b/sources/pyside2/tests/QtWidgets/bug_696.py
index 93703758e..51c10fc41 100644
--- a/sources/pyside2/tests/QtWidgets/bug_696.py
+++ b/sources/pyside2/tests/QtWidgets/bug_696.py
@@ -28,9 +28,12 @@
 ##
 #############################################################################
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtWidgets import QMainWindow, QMenu, QApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/bug_722.py b/sources/pyside2/tests/QtWidgets/bug_722.py
index ddabd4ee8..d465b84e3 100644
--- a/sources/pyside2/tests/QtWidgets/bug_722.py
+++ b/sources/pyside2/tests/QtWidgets/bug_722.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtWidgets import QDoubleSpinBox, QGraphicsBlurEffect
diff --git a/sources/pyside2/tests/QtWidgets/bug_750.py b/sources/pyside2/tests/QtWidgets/bug_750.py
index 334f11e90..e3a103d40 100644
--- a/sources/pyside2/tests/QtWidgets/bug_750.py
+++ b/sources/pyside2/tests/QtWidgets/bug_750.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtCore import QTimer
diff --git a/sources/pyside2/tests/QtWidgets/bug_778.py b/sources/pyside2/tests/QtWidgets/bug_778.py
index b03be3c92..b99cc2bd1 100644
--- a/sources/pyside2/tests/QtWidgets/bug_778.py
+++ b/sources/pyside2/tests/QtWidgets/bug_778.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtWidgets import QTreeWidget, QTreeWidgetItem, QTreeWidgetItemIterator
diff --git a/sources/pyside2/tests/QtWidgets/bug_811.py b/sources/pyside2/tests/QtWidgets/bug_811.py
index 4715c1a97..b02059836 100644
--- a/sources/pyside2/tests/QtWidgets/bug_811.py
+++ b/sources/pyside2/tests/QtWidgets/bug_811.py
@@ -26,10 +26,13 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
 import weakref
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtGui import QTextBlockUserData, QTextCursor
diff --git a/sources/pyside2/tests/QtWidgets/bug_854.py b/sources/pyside2/tests/QtWidgets/bug_854.py
index 080faf3c5..7b1904914 100644
--- a/sources/pyside2/tests/QtWidgets/bug_854.py
+++ b/sources/pyside2/tests/QtWidgets/bug_854.py
@@ -26,11 +26,16 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QTableView, QVBoxLayout, QApplication
 from PySide2.QtCore import QAbstractItemModel
 
 from helper import UsesQApplication
-import unittest
 
 
 class VirtualList(QAbstractItemModel):
diff --git a/sources/pyside2/tests/QtWidgets/bug_860.py b/sources/pyside2/tests/QtWidgets/bug_860.py
index 6cacfb21f..191d1c06c 100644
--- a/sources/pyside2/tests/QtWidgets/bug_860.py
+++ b/sources/pyside2/tests/QtWidgets/bug_860.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QSignalMapper
 from PySide2.QtWidgets import QCheckBox
 
diff --git a/sources/pyside2/tests/QtWidgets/bug_871.py b/sources/pyside2/tests/QtWidgets/bug_871.py
index 8905291ef..b224d02f3 100644
--- a/sources/pyside2/tests/QtWidgets/bug_871.py
+++ b/sources/pyside2/tests/QtWidgets/bug_871.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtGui import QValidator, QIntValidator
 from PySide2.QtWidgets import QLineEdit
diff --git a/sources/pyside2/tests/QtWidgets/bug_919.py b/sources/pyside2/tests/QtWidgets/bug_919.py
index d1cd460ec..737ce3a92 100644
--- a/sources/pyside2/tests/QtWidgets/bug_919.py
+++ b/sources/pyside2/tests/QtWidgets/bug_919.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import TimedQApplication
 from PySide2.QtCore import Signal, QTimer
 from PySide2.QtGui import QPainter
diff --git a/sources/pyside2/tests/QtWidgets/bug_921.py b/sources/pyside2/tests/QtWidgets/bug_921.py
index 3e24129d8..b70d9f428 100644
--- a/sources/pyside2/tests/QtWidgets/bug_921.py
+++ b/sources/pyside2/tests/QtWidgets/bug_921.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore, QtWidgets
 
 from helper import TimedQApplication
diff --git a/sources/pyside2/tests/QtWidgets/bug_972.py b/sources/pyside2/tests/QtWidgets/bug_972.py
index adc472403..f77c7d5ca 100644
--- a/sources/pyside2/tests/QtWidgets/bug_972.py
+++ b/sources/pyside2/tests/QtWidgets/bug_972.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QSizeF
 from PySide2.QtWidgets import QGraphicsProxyWidget, QSizePolicy, QPushButton, QGraphicsScene, QGraphicsView
 
diff --git a/sources/pyside2/tests/QtWidgets/customproxywidget_test.py b/sources/pyside2/tests/QtWidgets/customproxywidget_test.py
index 183f33404..7446a45f5 100644
--- a/sources/pyside2/tests/QtWidgets/customproxywidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/customproxywidget_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import Qt, QTimer
 from PySide2.QtGui import QPainter
diff --git a/sources/pyside2/tests/QtWidgets/event_filter_test.py b/sources/pyside2/tests/QtWidgets/event_filter_test.py
index 30ba91ec4..104631235 100644
--- a/sources/pyside2/tests/QtWidgets/event_filter_test.py
+++ b/sources/pyside2/tests/QtWidgets/event_filter_test.py
@@ -26,8 +26,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from helper import UsesQApplication
 from PySide2.QtCore import QObject, QEvent
diff --git a/sources/pyside2/tests/QtWidgets/grandparent_method_test.py b/sources/pyside2/tests/QtWidgets/grandparent_method_test.py
index a4ad1f5e4..e9f1c62f6 100644
--- a/sources/pyside2/tests/QtWidgets/grandparent_method_test.py
+++ b/sources/pyside2/tests/QtWidgets/grandparent_method_test.py
@@ -28,8 +28,12 @@
 
 '''Tests for calling methods further than the direct parent'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QPushButton, QWidget
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/hashabletype_test.py b/sources/pyside2/tests/QtWidgets/hashabletype_test.py
index c8ee3947d..9deeef101 100644
--- a/sources/pyside2/tests/QtWidgets/hashabletype_test.py
+++ b/sources/pyside2/tests/QtWidgets/hashabletype_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for __hash__'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QTreeWidgetItem
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/keep_reference_test.py b/sources/pyside2/tests/QtWidgets/keep_reference_test.py
index 094e4231c..ef32e198e 100644
--- a/sources/pyside2/tests/QtWidgets/keep_reference_test.py
+++ b/sources/pyside2/tests/QtWidgets/keep_reference_test.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from sys import getrefcount
 from helper import UsesQApplication
 from PySide2.QtCore import *
diff --git a/sources/pyside2/tests/QtWidgets/paint_event_test.py b/sources/pyside2/tests/QtWidgets/paint_event_test.py
index 6f1b75f2f..419b17b1e 100644
--- a/sources/pyside2/tests/QtWidgets/paint_event_test.py
+++ b/sources/pyside2/tests/QtWidgets/paint_event_test.py
@@ -28,8 +28,12 @@
 
 '''Test paint event override in python'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QTimerEvent
 from PySide2.QtWidgets import QApplication, QWidget
 
diff --git a/sources/pyside2/tests/QtWidgets/parent_method_test.py b/sources/pyside2/tests/QtWidgets/parent_method_test.py
index 65a8d713d..6fcf4b807 100644
--- a/sources/pyside2/tests/QtWidgets/parent_method_test.py
+++ b/sources/pyside2/tests/QtWidgets/parent_method_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QTimer, QThread
 from PySide2.QtWidgets import *
 
diff --git a/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py b/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py
index c253ee7d4..484e545c3 100644
--- a/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 from PySide2.QtCore import QSizeF, QTimer
diff --git a/sources/pyside2/tests/QtWidgets/qaction_test.py b/sources/pyside2/tests/QtWidgets/qaction_test.py
index 7e391c5f7..80fefa5b6 100644
--- a/sources/pyside2/tests/QtWidgets/qaction_test.py
+++ b/sources/pyside2/tests/QtWidgets/qaction_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QAction, QWidget
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qbrush_test.py b/sources/pyside2/tests/QtWidgets/qbrush_test.py
index 7c49e9b86..57d7b048c 100644
--- a/sources/pyside2/tests/QtWidgets/qbrush_test.py
+++ b/sources/pyside2/tests/QtWidgets/qbrush_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QBrush'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import Qt
 from PySide2.QtGui import QColor, QBrush
 from PySide2.QtWidgets import QApplication
diff --git a/sources/pyside2/tests/QtWidgets/qcolormap_test.py b/sources/pyside2/tests/QtWidgets/qcolormap_test.py
index 12c624c35..d3e0bf4d9 100644
--- a/sources/pyside2/tests/QtWidgets/qcolormap_test.py
+++ b/sources/pyside2/tests/QtWidgets/qcolormap_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QColormap
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qdynamic_signal.py b/sources/pyside2/tests/QtWidgets/qdynamic_signal.py
index b8ea7af3f..f5a34f591 100644
--- a/sources/pyside2/tests/QtWidgets/qdynamic_signal.py
+++ b/sources/pyside2/tests/QtWidgets/qdynamic_signal.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject
 from PySide2.QtWidgets import QInputDialog
 
diff --git a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
index 09e9b7173..ec28beab3 100644
--- a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
+++ b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
@@ -26,8 +26,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2 import QtCore
 from PySide2 import QtGui
diff --git a/sources/pyside2/tests/QtWidgets/qformlayout_test.py b/sources/pyside2/tests/QtWidgets/qformlayout_test.py
index f42a75cee..ee1c89106 100644
--- a/sources/pyside2/tests/QtWidgets/qformlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qformlayout_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QFormLayout, QWidget
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
index 345ea7c45..1de8eb1f1 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore
 from PySide2 import QtGui
 from PySide2 import QtWidgets
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py
index 8e9931d42..53f48c9f5 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py
@@ -28,8 +28,12 @@
 
 ''' Test cases related to QGraphicsItem and subclasses'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QPolygonF, QColor, QBrush
 from PySide2.QtWidgets import QGraphicsScene
 
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py
index 97a8bc5b6..cbdb3a2ea 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py
@@ -28,8 +28,12 @@
 
 ''' Test cases related to QGraphicsItem and subclasses'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QGraphicsObject, QGraphicsWidget
 from PySide2.QtCore import QRectF
 
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py
index 0e5cd8bfe..b31a272ec 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import Qt, QTimer
 from PySide2.QtGui import QPainter
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py
index 80a09dc57..40c7abd4e 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py
@@ -28,8 +28,12 @@
 
 '''Basic test cases for QGraphicsScene'''
 
-import unittest
 import gc
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QPointF
 from PySide2.QtGui import QPolygonF, QPixmap, QPainterPath, QTransform, QWindow
diff --git a/sources/pyside2/tests/QtWidgets/qimage_test.py b/sources/pyside2/tests/QtWidgets/qimage_test.py
index 07f59c8e0..c79f049cf 100644
--- a/sources/pyside2/tests/QtWidgets/qimage_test.py
+++ b/sources/pyside2/tests/QtWidgets/qimage_test.py
@@ -28,7 +28,12 @@
 
 '''Test cases for QImage'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
diff --git a/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py b/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py
index 2f5dcec62..79486882f 100644
--- a/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py
+++ b/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore, QtWidgets
 from helper import UsesQApplication, TimedQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py b/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py
index cbfaf9c31..803d77eca 100644
--- a/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py
+++ b/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py
@@ -28,7 +28,12 @@
 
 '''Test cases for QKeySequenceEdit.'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QTimer
 from PySide2.QtWidgets import QKeySequenceEdit
 
diff --git a/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py b/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py
index ece5626a3..79595693f 100644
--- a/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QLayout handling of child widgets references'''
 
-import unittest
+import os
+import sys
 from sys import getrefcount
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtWidgets import QHBoxLayout, QVBoxLayout, QGridLayout, QWidget
 from PySide2.QtWidgets import QStackedLayout, QFormLayout
diff --git a/sources/pyside2/tests/QtWidgets/qlayout_test.py b/sources/pyside2/tests/QtWidgets/qlayout_test.py
index 09b394a60..694696ceb 100644
--- a/sources/pyside2/tests/QtWidgets/qlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlayout_test.py
@@ -26,8 +26,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from helper import UsesQApplication
 from PySide2.QtCore import *
diff --git a/sources/pyside2/tests/QtWidgets/qlistwidget_test.py b/sources/pyside2/tests/QtWidgets/qlistwidget_test.py
index 7e2d351bc..c0ece9048 100644
--- a/sources/pyside2/tests/QtWidgets/qlistwidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlistwidget_test.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
-import sys
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtWidgets, QtCore
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py b/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py
index 1bee79863..e6b2577c1 100644
--- a/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtWidgets
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/qmainwindow_test.py b/sources/pyside2/tests/QtWidgets/qmainwindow_test.py
index a6b4a05cc..64a89f905 100644
--- a/sources/pyside2/tests/QtWidgets/qmainwindow_test.py
+++ b/sources/pyside2/tests/QtWidgets/qmainwindow_test.py
@@ -26,10 +26,13 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
 import weakref
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtWidgets
 from PySide2 import QtCore
 
diff --git a/sources/pyside2/tests/QtWidgets/qmenu_test.py b/sources/pyside2/tests/QtWidgets/qmenu_test.py
index 74a677938..9cd2fc9e8 100644
--- a/sources/pyside2/tests/QtWidgets/qmenu_test.py
+++ b/sources/pyside2/tests/QtWidgets/qmenu_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QMenu
 from PySide2.QtGui import QKeySequence, QIcon
 from PySide2.QtCore import SLOT
diff --git a/sources/pyside2/tests/QtWidgets/qmenuadd_test.py b/sources/pyside2/tests/QtWidgets/qmenuadd_test.py
index 916b15660..1be14d796 100644
--- a/sources/pyside2/tests/QtWidgets/qmenuadd_test.py
+++ b/sources/pyside2/tests/QtWidgets/qmenuadd_test.py
@@ -30,8 +30,11 @@
 
 ''' Test the QMenu.addAction() method'''
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2 import QtWidgets
 
diff --git a/sources/pyside2/tests/QtWidgets/qobject_mi_test.py b/sources/pyside2/tests/QtWidgets/qobject_mi_test.py
index 4a7f8b35d..be95cab85 100644
--- a/sources/pyside2/tests/QtWidgets/qobject_mi_test.py
+++ b/sources/pyside2/tests/QtWidgets/qobject_mi_test.py
@@ -30,8 +30,12 @@
 
 '''Test cases for multiple inheritance from 2 QObjects'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
diff --git a/sources/pyside2/tests/QtWidgets/qpen_test.py b/sources/pyside2/tests/QtWidgets/qpen_test.py
index 28efa731a..fdcdc60ca 100644
--- a/sources/pyside2/tests/QtWidgets/qpen_test.py
+++ b/sources/pyside2/tests/QtWidgets/qpen_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtCore import Qt, QTimer
diff --git a/sources/pyside2/tests/QtWidgets/qpicture_test.py b/sources/pyside2/tests/QtWidgets/qpicture_test.py
index b5ec577d2..3a2a5439b 100644
--- a/sources/pyside2/tests/QtWidgets/qpicture_test.py
+++ b/sources/pyside2/tests/QtWidgets/qpicture_test.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
-import os
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import QTimer
 from PySide2.QtGui import QPicture, QPainter
diff --git a/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py b/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py
index d3748beb9..32eea87c9 100644
--- a/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py
+++ b/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QLabel
 
diff --git a/sources/pyside2/tests/QtWidgets/qpushbutton_test.py b/sources/pyside2/tests/QtWidgets/qpushbutton_test.py
index c73d550fb..632312df9 100644
--- a/sources/pyside2/tests/QtWidgets/qpushbutton_test.py
+++ b/sources/pyside2/tests/QtWidgets/qpushbutton_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtWidgets import QPushButton, QMenu, QWidget
 from PySide2.QtCore import QTimer
diff --git a/sources/pyside2/tests/QtWidgets/qsplitter_test.py b/sources/pyside2/tests/QtWidgets/qsplitter_test.py
index 6a6824a1a..b42747f66 100644
--- a/sources/pyside2/tests/QtWidgets/qsplitter_test.py
+++ b/sources/pyside2/tests/QtWidgets/qsplitter_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QSplitter
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
index c07bd8705..cef918156 100644
--- a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
@@ -26,8 +26,11 @@
 ##
 #############################################################################
 
-import unittest
+import os
 import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtGui import QStandardItemModel, QStandardItem
 from PySide2.QtWidgets import QWidget
diff --git a/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py b/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
index 6538607ff..6a83c5c46 100644
--- a/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
@@ -31,7 +31,12 @@
 
 '''Tests conversions of QString to and from QKeySequence.'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qstyle_test.py b/sources/pyside2/tests/QtWidgets/qstyle_test.py
index 1dcce2737..5b29c824f 100644
--- a/sources/pyside2/tests/QtWidgets/qstyle_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstyle_test.py
@@ -27,7 +27,12 @@
 #############################################################################
 
 import sys
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 from PySide2.QtGui import QWindow
diff --git a/sources/pyside2/tests/QtWidgets/qtableview_test.py b/sources/pyside2/tests/QtWidgets/qtableview_test.py
index 1f5b52cda..a9a0f3260 100644
--- a/sources/pyside2/tests/QtWidgets/qtableview_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtableview_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QAbstractTableModel
 from PySide2.QtWidgets import QTableWidget
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/qtabwidget_test.py b/sources/pyside2/tests/QtWidgets/qtabwidget_test.py
index b3ce46d90..69700d451 100644
--- a/sources/pyside2/tests/QtWidgets/qtabwidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtabwidget_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import *
 from helper import TimedQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
index c3300fc77..65d7517a6 100644
--- a/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QMainWindow, QTabWidget, QTextEdit, QSplitter
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py b/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py
index f6730a282..c3cc154bb 100644
--- a/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py
@@ -26,10 +26,15 @@
 ##
 #############################################################################
 
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore, QtWidgets
 from helper import UsesQApplication
 
-import unittest
 
 class MyWindow(QtWidgets.QMainWindow):
     appendText = QtCore.Signal(str)
diff --git a/sources/pyside2/tests/QtWidgets/qtextedit_test.py b/sources/pyside2/tests/QtWidgets/qtextedit_test.py
index 34467ddae..ddf0706a3 100644
--- a/sources/pyside2/tests/QtWidgets/qtextedit_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtextedit_test.py
@@ -28,8 +28,13 @@
 
 '''Test cases for QTextEdit and ownership problems.'''
 
-import unittest
+import os
+import sys
 from sys import getrefcount
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QTextEdit
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/qtoolbar_test.py b/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
index 24b36e09b..ab6351e24 100644
--- a/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for QToolbar'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QToolBar, QMainWindow, QAction
 
 from helper import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/qtoolbox_test.py b/sources/pyside2/tests/QtWidgets/qtoolbox_test.py
index f41933c2e..04509a59a 100644
--- a/sources/pyside2/tests/QtWidgets/qtoolbox_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtoolbox_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QIcon
 from PySide2.QtWidgets import QToolBox, QWidget
 
diff --git a/sources/pyside2/tests/QtWidgets/qtreeview_test.py b/sources/pyside2/tests/QtWidgets/qtreeview_test.py
index a344aeff8..4434895f8 100644
--- a/sources/pyside2/tests/QtWidgets/qtreeview_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtreeview_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QStandardItemModel
 from PySide2.QtWidgets import (QWidget, QTreeView, QVBoxLayout,
     QStyledItemDelegate, QHeaderView)
diff --git a/sources/pyside2/tests/QtWidgets/qtreewidget_test.py b/sources/pyside2/tests/QtWidgets/qtreewidget_test.py
index 4afd0690d..8dbecefe2 100644
--- a/sources/pyside2/tests/QtWidgets/qtreewidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtreewidget_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QTreeWidget, QTreeWidgetItem, QPushButton
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qvariant_test.py b/sources/pyside2/tests/QtWidgets/qvariant_test.py
index 907e6d9ed..1e9d3d719 100644
--- a/sources/pyside2/tests/QtWidgets/qvariant_test.py
+++ b/sources/pyside2/tests/QtWidgets/qvariant_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import (QApplication, QComboBox, QGraphicsScene,
     QGraphicsRectItem)
 
diff --git a/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py b/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py
index 7fb17f912..b3f5460ac 100644
--- a/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QWidget, QVBoxLayout, QPushButton, QApplication, QHBoxLayout
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qwidget_test.py b/sources/pyside2/tests/QtWidgets/qwidget_test.py
index d0a4a8dfa..b7e307df9 100644
--- a/sources/pyside2/tests/QtWidgets/qwidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qwidget_test.py
@@ -27,8 +27,12 @@
 #############################################################################
 
 import sys
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QWidget, QMainWindow
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/reference_count_test.py b/sources/pyside2/tests/QtWidgets/reference_count_test.py
index c2a0ec979..188ceba09 100644
--- a/sources/pyside2/tests/QtWidgets/reference_count_test.py
+++ b/sources/pyside2/tests/QtWidgets/reference_count_test.py
@@ -28,12 +28,13 @@
 
 '''Test cases for Reference count when the object is created in c++ side'''
 
-import unittest
-
+import gc
+import os
 import sys
+import unittest
 import weakref
-import gc
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import Qt, QPointF
 from PySide2.QtGui import QPolygonF
diff --git a/sources/pyside2/tests/QtWidgets/standardpixmap_test.py b/sources/pyside2/tests/QtWidgets/standardpixmap_test.py
index 57c697aa3..21bc4cebe 100644
--- a/sources/pyside2/tests/QtWidgets/standardpixmap_test.py
+++ b/sources/pyside2/tests/QtWidgets/standardpixmap_test.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QStyle
 
diff --git a/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py b/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py
index 8895e1980..6c8336513 100644
--- a/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py
+++ b/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py
@@ -28,8 +28,12 @@
 
 '''Test cases for overriding inherited protected virtual methods'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QTimerEvent
 from PySide2.QtWidgets import QApplication, QSpinBox
 
diff --git a/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py b/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py
index 756915d67..7695cf700 100644
--- a/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py
+++ b/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtWidgets import QGraphicsScene, QGraphicsRectItem, QGraphicsView, QApplication
 from PySide2.QtGui import QBrush, QColor
 from PySide2.QtCore import QTimer
diff --git a/sources/pyside2/tests/QtWidgets/wrong_return_test.py b/sources/pyside2/tests/QtWidgets/wrong_return_test.py
index f4f036cc9..7a89520f8 100644
--- a/sources/pyside2/tests/QtWidgets/wrong_return_test.py
+++ b/sources/pyside2/tests/QtWidgets/wrong_return_test.py
@@ -28,12 +28,18 @@
 
 '''Test cases for Virtual functions with wrong return type'''
 
+import os
+import sys
 import unittest
+import warnings
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 from PySide2 import QtWidgets
 from helper import UsesQApplication
 
-import warnings
+
 warnings.simplefilter('error')
 
 
diff --git a/sources/pyside2/tests/QtXml/qdomdocument_test.py b/sources/pyside2/tests/QtXml/qdomdocument_test.py
index 63f9fd430..3ff296503 100644
--- a/sources/pyside2/tests/QtXml/qdomdocument_test.py
+++ b/sources/pyside2/tests/QtXml/qdomdocument_test.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QByteArray
 from PySide2.QtXml import QDomDocument, QDomElement
 import py3kcompat as py3k
diff --git a/sources/pyside2/tests/QtXmlPatterns/import_test.py b/sources/pyside2/tests/QtXmlPatterns/import_test.py
index bbbb7da07..c35a020d6 100644
--- a/sources/pyside2/tests/QtXmlPatterns/import_test.py
+++ b/sources/pyside2/tests/QtXmlPatterns/import_test.py
@@ -28,7 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from PySide2.QtXmlPatterns import QXmlSchema
 from helper import UsesQCoreApplication
diff --git a/sources/pyside2/tests/mac/qmacstyle_test.py b/sources/pyside2/tests/mac/qmacstyle_test.py
index 690758fc7..90f7bf032 100644
--- a/sources/pyside2/tests/mac/qmacstyle_test.py
+++ b/sources/pyside2/tests/mac/qmacstyle_test.py
@@ -30,8 +30,12 @@
 from PySide2.QtWidgets import QApplication, QLabel, QStyleFactory
 from PySide2.QtCore import QObject
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 
 class QMacStyleTest(UsesQApplication):
diff --git a/sources/pyside2/tests/pysidetest/constructor_properties_test.py b/sources/pyside2/tests/pysidetest/constructor_properties_test.py
index 48e2a7aae..cb2e02773 100644
--- a/sources/pyside2/tests/pysidetest/constructor_properties_test.py
+++ b/sources/pyside2/tests/pysidetest/constructor_properties_test.py
@@ -37,8 +37,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from helper import UsesQApplication
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QApplication, QLabel, QFrame
diff --git a/sources/pyside2/tests/signals/bug_189.py b/sources/pyside2/tests/signals/bug_189.py
index 51810b66c..113cb2485 100644
--- a/sources/pyside2/tests/signals/bug_189.py
+++ b/sources/pyside2/tests/signals/bug_189.py
@@ -26,8 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore, QtWidgets
 from helper import UsesQApplication
 
diff --git a/sources/pyside2/tests/signals/bug_311.py b/sources/pyside2/tests/signals/bug_311.py
index 2f77bb973..9f5e84dbf 100644
--- a/sources/pyside2/tests/signals/bug_311.py
+++ b/sources/pyside2/tests/signals/bug_311.py
@@ -29,7 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/bug_319.py b/sources/pyside2/tests/signals/bug_319.py
index 7210af072..7e8728e7a 100644
--- a/sources/pyside2/tests/signals/bug_319.py
+++ b/sources/pyside2/tests/signals/bug_319.py
@@ -29,7 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2 import QtCore
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/lambda_gui_test.py b/sources/pyside2/tests/signals/lambda_gui_test.py
index f6eb7b364..0a0db9514 100644
--- a/sources/pyside2/tests/signals/lambda_gui_test.py
+++ b/sources/pyside2/tests/signals/lambda_gui_test.py
@@ -28,8 +28,12 @@
 
 '''Connecting lambda to gui signals'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL
 
 try:
diff --git a/sources/pyside2/tests/signals/lambda_test.py b/sources/pyside2/tests/signals/lambda_test.py
index c22674fcc..97d0c90fc 100644
--- a/sources/pyside2/tests/signals/lambda_test.py
+++ b/sources/pyside2/tests/signals/lambda_test.py
@@ -30,9 +30,12 @@
 
 '''Connecting lambda to signals'''
 
+import os
 import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL, QProcess
 
 from helper import UsesQCoreApplication
diff --git a/sources/pyside2/tests/signals/multiple_connections_gui_test.py b/sources/pyside2/tests/signals/multiple_connections_gui_test.py
index a80f6277c..45dbb6c94 100644
--- a/sources/pyside2/tests/signals/multiple_connections_gui_test.py
+++ b/sources/pyside2/tests/signals/multiple_connections_gui_test.py
@@ -26,9 +26,13 @@
 ##
 #############################################################################
 
-import unittest
-import random
 from functools import partial
+import os
+import random
+import sys
+import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QObject, SIGNAL
 
diff --git a/sources/pyside2/tests/signals/multiple_connections_test.py b/sources/pyside2/tests/signals/multiple_connections_test.py
index 2ce780e4e..9c7e7c9da 100644
--- a/sources/pyside2/tests/signals/multiple_connections_test.py
+++ b/sources/pyside2/tests/signals/multiple_connections_test.py
@@ -26,9 +26,12 @@
 ##
 #############################################################################
 
+from functools import partial
+import os
 import sys
 import unittest
-from functools import partial
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QObject, SIGNAL, QProcess
 
diff --git a/sources/pyside2/tests/signals/pysignal_test.py b/sources/pyside2/tests/signals/pysignal_test.py
index a5f2d8c5e..51d4f8368 100644
--- a/sources/pyside2/tests/signals/pysignal_test.py
+++ b/sources/pyside2/tests/signals/pysignal_test.py
@@ -26,7 +26,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL, SLOT, Qt
 
 try:
diff --git a/sources/pyside2/tests/signals/qobject_sender_test.py b/sources/pyside2/tests/signals/qobject_sender_test.py
index 432450bb8..7aa98ced8 100644
--- a/sources/pyside2/tests/signals/qobject_sender_test.py
+++ b/sources/pyside2/tests/signals/qobject_sender_test.py
@@ -31,7 +31,12 @@
 
 '''Test cases for QObject.sender()'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/ref02_test.py b/sources/pyside2/tests/signals/ref02_test.py
index 5449d6afa..ddd82e3c4 100644
--- a/sources/pyside2/tests/signals/ref02_test.py
+++ b/sources/pyside2/tests/signals/ref02_test.py
@@ -29,7 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QCoreApplication, QTimeLine
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/ref05_test.py b/sources/pyside2/tests/signals/ref05_test.py
index 9bc299332..173027a88 100644
--- a/sources/pyside2/tests/signals/ref05_test.py
+++ b/sources/pyside2/tests/signals/ref05_test.py
@@ -29,7 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QCoreApplication, QTimeLine, Slot
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/ref06_test.py b/sources/pyside2/tests/signals/ref06_test.py
index a5b26b393..689dd8113 100644
--- a/sources/pyside2/tests/signals/ref06_test.py
+++ b/sources/pyside2/tests/signals/ref06_test.py
@@ -29,7 +29,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, QCoreApplication, QTimeLine, Signal, Slot
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/self_connect_test.py b/sources/pyside2/tests/signals/self_connect_test.py
index ee84a75c5..8620c10d6 100644
--- a/sources/pyside2/tests/signals/self_connect_test.py
+++ b/sources/pyside2/tests/signals/self_connect_test.py
@@ -30,8 +30,12 @@
 
 '''Using self.connect(signal, method)'''
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL, SLOT
 from PySide2.QtWidgets import QPushButton, QWidget
 
diff --git a/sources/pyside2/tests/signals/signal_emission_gui_test.py b/sources/pyside2/tests/signals/signal_emission_gui_test.py
index a357b1536..0a6255f8a 100644
--- a/sources/pyside2/tests/signals/signal_emission_gui_test.py
+++ b/sources/pyside2/tests/signals/signal_emission_gui_test.py
@@ -30,8 +30,12 @@
 
 """Tests covering signal emission and receiving to python slots"""
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL, SLOT
 
 try:
diff --git a/sources/pyside2/tests/signals/signal_emission_test.py b/sources/pyside2/tests/signals/signal_emission_test.py
index d4f17700b..844bccc21 100644
--- a/sources/pyside2/tests/signals/signal_emission_test.py
+++ b/sources/pyside2/tests/signals/signal_emission_test.py
@@ -30,9 +30,12 @@
 
 """Tests covering signal emission and receiving to python slots"""
 
+import functools
+import os
 import sys
 import unittest
-import functools
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
 from PySide2.QtCore import QObject, SIGNAL, SLOT, QProcess, QTimeLine
 
diff --git a/sources/pyside2/tests/signals/signal_object_test.py b/sources/pyside2/tests/signals/signal_object_test.py
index ab9522b13..75115b37c 100644
--- a/sources/pyside2/tests/signals/signal_object_test.py
+++ b/sources/pyside2/tests/signals/signal_object_test.py
@@ -28,8 +28,12 @@
 ##
 #############################################################################
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QTimer, Signal, QObject, Slot, Qt
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/signal_signature_test.py b/sources/pyside2/tests/signals/signal_signature_test.py
index 191f209a8..0cce9c2f1 100644
--- a/sources/pyside2/tests/signals/signal_signature_test.py
+++ b/sources/pyside2/tests/signals/signal_signature_test.py
@@ -30,7 +30,12 @@
 
 '''Test case for signal signature received by QObject::connectNotify().'''
 
+import os
+import sys
 import unittest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import *
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/signals/static_metaobject_test.py b/sources/pyside2/tests/signals/static_metaobject_test.py
index b66610f38..2b76e6874 100644
--- a/sources/pyside2/tests/signals/static_metaobject_test.py
+++ b/sources/pyside2/tests/signals/static_metaobject_test.py
@@ -30,8 +30,12 @@
 
 """Tests covering signal emission and receiving to python slots"""
 
+import os
+import sys
 import unittest
 
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 from PySide2.QtCore import QObject, SIGNAL, Slot
 from helper import UsesQCoreApplication
 
diff --git a/sources/pyside2/tests/util/httpd.py b/sources/pyside2/tests/util/httpd.py
index 4cf74a20d..41ac126fb 100644
--- a/sources/pyside2/tests/util/httpd.py
+++ b/sources/pyside2/tests/util/httpd.py
@@ -27,10 +27,14 @@
 #############################################################################
 
 import os
+import random
+import select
 import sys
+import tempfile
 import threading
-import select
-import random
+
+sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
+
 import py3kcompat as py3k
 
 if py3k.IS_PY3K:
author	Friedemann Kleint <Friedemann.Kleint@qt.io>	2020-02-13 09:43:03 +0100
committer	Friedemann Kleint <Friedemann.Kleint@qt.io>	2020-02-19 21:09:26 +0100
commit	5b868dae533e37b13be7890840191263a2caaa23 (patch)
tree	2de89f87e11aa94a007c45e8452b171caf867ba5
parent	5899fa54279b9d7bfbdda8a8d2a1e60a3c7b264a (diff)