Pyside2/tests: Split the helper module

The classes of the helper module were defined in the __init__.py file with complicated logic to test for presence of the modules. Split the classes apart and empty the __init__.py file (still required for Python2). Change-Id: I4f4971f9a48e2961233da5585aa0df53bfbb9c7a Reviewed-by: Christian Tismer <tismer@stackless.com>
author: Friedemann Kleint <Friedemann.Kleint@qt.io> 2020-02-19 09:51:25 +0100
committer: Friedemann Kleint <Friedemann.Kleint@qt.io> 2020-02-20 22:16:57 +0100
commit: f69d163d17d3717c28f2c065173113756d7c50ef (patch)
tree: f8203180c87c919b228fed4f70d2a3a23b81246d
parent: bc4d618d5f4c82c9a826a195043739c7e63ed138 (diff)
205 files changed, 535 insertions, 373 deletions
diff --git a/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py b/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py
index 0c2cec095..2f7cc21aa 100644
--- a/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py
+++ b/sources/pyside2/tests/Qt3DExtras/qt3dextras_test.py
@@ -36,7 +36,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import UsesQGuiApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 
 from PySide2.QtCore import(Property, QObject, QPropertyAnimation, QTimer, Signal, Slot)
 from PySide2.QtGui import (QGuiApplication, QMatrix4x4, QQuaternion, QVector3D, QWindow)
diff --git a/sources/pyside2/tests/QtCharts/qcharts_test.py b/sources/pyside2/tests/QtCharts/qcharts_test.py
index 20a122374..6605c2218 100644
--- a/sources/pyside2/tests/QtCharts/qcharts_test.py
+++ b/sources/pyside2/tests/QtCharts/qcharts_test.py
@@ -36,7 +36,7 @@ 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.usesqapplication 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/child_event_test.py b/sources/pyside2/tests/QtCore/child_event_test.py
index f121c975e..4a6ea6793 100644
--- a/sources/pyside2/tests/QtCore/child_event_test.py
+++ b/sources/pyside2/tests/QtCore/child_event_test.py
@@ -37,7 +37,7 @@ 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
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class ExtQObject(QObject):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtCore/deletelater_test.py b/sources/pyside2/tests/QtCore/deletelater_test.py
index 7b497f0c9..1a0fbca19 100644
--- a/sources/pyside2/tests/QtCore/deletelater_test.py
+++ b/sources/pyside2/tests/QtCore/deletelater_test.py
@@ -37,7 +37,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class TestDeleteLater(UsesQCoreApplication):
     '''Test case for function DeleteLater'''
diff --git a/sources/pyside2/tests/QtCore/duck_punching_test.py b/sources/pyside2/tests/QtCore/duck_punching_test.py
index 3115454b1..27eaf341a 100644
--- a/sources/pyside2/tests/QtCore/duck_punching_test.py
+++ b/sources/pyside2/tests/QtCore/duck_punching_test.py
@@ -38,7 +38,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 def MethodType(func, instance, instanceType):
     if sys.version_info[0] == 3:
diff --git a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
index a7774b996..74db16ff8 100644
--- a/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_connect_notify_test.py
@@ -37,7 +37,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 def cute_slot():
     pass
diff --git a/sources/pyside2/tests/QtCore/qobject_event_filter_test.py b/sources/pyside2/tests/QtCore/qobject_event_filter_test.py
index 15ba59f37..4b372df3a 100644
--- a/sources/pyside2/tests/QtCore/qobject_event_filter_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_event_filter_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QObject, QTimerEvent
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class FilterObject(QObject):
     '''Filter object for the basic test'''
diff --git a/sources/pyside2/tests/QtCore/qobject_timer_event_test.py b/sources/pyside2/tests/QtCore/qobject_timer_event_test.py
index e960cac7e..7abc1528b 100644
--- a/sources/pyside2/tests/QtCore/qobject_timer_event_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_timer_event_test.py
@@ -38,7 +38,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QObject, QCoreApplication
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class Dummy(QObject):
 
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 98ab373e4..ee416d08f 100644
--- a/sources/pyside2/tests/QtCore/qobject_tr_as_instance_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_tr_as_instance_test.py
@@ -40,7 +40,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QObject
 
-#from helper import UsesQCoreApplication
+#from helper.usesqcoreapplication import UsesQCoreApplication
 
 class QObjectTrTest(unittest.TestCase):
     '''Test case to check if QObject tr static methods could be treated as instance methods.'''
diff --git a/sources/pyside2/tests/QtCore/qresource_test.py b/sources/pyside2/tests/QtCore/qresource_test.py
index d6d325951..953786799 100644
--- a/sources/pyside2/tests/QtCore/qresource_test.py
+++ b/sources/pyside2/tests/QtCore/qresource_test.py
@@ -36,7 +36,7 @@ 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 helper.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 c151a5926..97aa7522b 100644
--- a/sources/pyside2/tests/QtCore/qsettings_test.py
+++ b/sources/pyside2/tests/QtCore/qsettings_test.py
@@ -34,7 +34,7 @@ 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 helper.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 d776a52a1..388d9ed01 100644
--- a/sources/pyside2/tests/QtCore/qstatemachine_test.py
+++ b/sources/pyside2/tests/QtCore/qstatemachine_test.py
@@ -38,7 +38,7 @@ from PySide2.QtCore import QObject, QState, QFinalState, SIGNAL
 from PySide2.QtCore import QTimer, QStateMachine
 from PySide2.QtCore import QParallelAnimationGroup
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 
 class StateMachineTest(unittest.TestCase):
diff --git a/sources/pyside2/tests/QtCore/qthread_test.py b/sources/pyside2/tests/QtCore/qthread_test.py
index c84022dc7..73683e50f 100644
--- a/sources/pyside2/tests/QtCore/qthread_test.py
+++ b/sources/pyside2/tests/QtCore/qthread_test.py
@@ -39,7 +39,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QThread, QCoreApplication, QObject, SIGNAL, QMutex, QTimer
 from PySide2.QtCore import QEventLoop
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 mutex = QMutex()
 
diff --git a/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py b/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py
index e74099c77..9b2a1567f 100644
--- a/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py
+++ b/sources/pyside2/tests/QtCore/qtimer_singleshot_test.py
@@ -37,7 +37,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class WatchDog(QObject):
     '''Exits the QCoreApplication main loop after sometime.'''
diff --git a/sources/pyside2/tests/QtCore/qtimer_timeout_test.py b/sources/pyside2/tests/QtCore/qtimer_timeout_test.py
index 7e6c10f51..54ff63bc2 100644
--- a/sources/pyside2/tests/QtCore/qtimer_timeout_test.py
+++ b/sources/pyside2/tests/QtCore/qtimer_timeout_test.py
@@ -35,7 +35,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 
 class WatchDog(QObject):
diff --git a/sources/pyside2/tests/QtCore/thread_signals_test.py b/sources/pyside2/tests/QtCore/thread_signals_test.py
index 811d2055c..9800d2e09 100644
--- a/sources/pyside2/tests/QtCore/thread_signals_test.py
+++ b/sources/pyside2/tests/QtCore/thread_signals_test.py
@@ -35,7 +35,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class MyThread(QThread):
 
diff --git a/sources/pyside2/tests/QtCore/translation_test.py b/sources/pyside2/tests/QtCore/translation_test.py
index 758c1e277..1dfeedeef 100644
--- a/sources/pyside2/tests/QtCore/translation_test.py
+++ b/sources/pyside2/tests/QtCore/translation_test.py
@@ -40,7 +40,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 import py3kcompat as py3k
 from PySide2.QtCore import QObject, QTranslator, QCoreApplication
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class TranslationTest(UsesQCoreApplication):
     '''Test case for Qt translation facilities.'''
diff --git a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
index efa518eb5..2ff705ee1 100644
--- a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
+++ b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
@@ -36,7 +36,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import UsesQGuiApplication
+from helper.usesqguiapplication import UsesQGuiApplication
 from PySide2.QtCore import QTimer
 from PySide2.QtDataVisualization import QtDataVisualization
 
diff --git a/sources/pyside2/tests/QtGui/bug_367.py b/sources/pyside2/tests/QtGui/bug_367.py
index 0d917e62b..2780df5c9 100644
--- a/sources/pyside2/tests/QtGui/bug_367.py
+++ b/sources/pyside2/tests/QtGui/bug_367.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2 import QtCore,QtGui
 
 class BugTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtGui/bug_740.py b/sources/pyside2/tests/QtGui/bug_740.py
index b01ac4a94..bfd9a03fe 100644
--- a/sources/pyside2/tests/QtGui/bug_740.py
+++ b/sources/pyside2/tests/QtGui/bug_740.py
@@ -33,7 +33,7 @@ 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 helper.usesqapplication import UsesQApplication
 from PySide2.QtCore import QSize
 from PySide2.QtGui import QBitmap, QImage
 
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 e2ea09706..9277fecbb 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
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtGui import QImage, qRgb
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class SetPixelFloat(UsesQApplication):
     '''Test case for calling setPixel with float as argument'''
diff --git a/sources/pyside2/tests/QtGui/qcursor_test.py b/sources/pyside2/tests/QtGui/qcursor_test.py
index a19b66a1d..02c0fe514 100644
--- a/sources/pyside2/tests/QtGui/qcursor_test.py
+++ b/sources/pyside2/tests/QtGui/qcursor_test.py
@@ -37,7 +37,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class TestQCursor(UsesQApplication):
     def testQCursorConstructor(self):
diff --git a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
index e6307a6ed..9c35cd452 100644
--- a/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
+++ b/sources/pyside2/tests/QtGui/qdatastream_gui_operators_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QDataStream, QByteArray, QIODevice, Qt
 from PySide2.QtGui import QPixmap, QColor
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QPixmapQDatastream(UsesQApplication):
     '''QDataStream <<>> QPixmap'''
diff --git a/sources/pyside2/tests/QtGui/qfontmetrics_test.py b/sources/pyside2/tests/QtGui/qfontmetrics_test.py
index 012b9af84..5b5c7d2bf 100644
--- a/sources/pyside2/tests/QtGui/qfontmetrics_test.py
+++ b/sources/pyside2/tests/QtGui/qfontmetrics_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtGui import QFont, QFontMetrics, QFontMetricsF
 from PySide2.QtCore import QRect, QRectF, Qt, QSize, QSizeF
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 class QFontMetricsTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtGui/qicon_test.py b/sources/pyside2/tests/QtGui/qicon_test.py
index 42b3f48fa..a8763e653 100644
--- a/sources/pyside2/tests/QtGui/qicon_test.py
+++ b/sources/pyside2/tests/QtGui/qicon_test.py
@@ -32,7 +32,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import TimedQApplication
+from helper.timedqapplication 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 6c1d7d07f..4bb0375ff 100644
--- a/sources/pyside2/tests/QtGui/qitemselection_test.py
+++ b/sources/pyside2/tests/QtGui/qitemselection_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 1a815c6d7..be28e5dec 100644
--- a/sources/pyside2/tests/QtGui/qkeysequence_test.py
+++ b/sources/pyside2/tests/QtGui/qkeysequence_test.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import Qt
 from PySide2.QtGui import QKeySequence
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QKeySequenceTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtGui/qopenglbuffer_test.py b/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
index b05079d74..c80bd41b2 100644
--- a/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
+++ b/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
@@ -35,7 +35,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtGui import QOpenGLBuffer
 from PySide2 import QtGui
 
diff --git a/sources/pyside2/tests/QtGui/qopenglwindow_test.py b/sources/pyside2/tests/QtGui/qopenglwindow_test.py
index 2f846265e..316b39203 100644
--- a/sources/pyside2/tests/QtGui/qopenglwindow_test.py
+++ b/sources/pyside2/tests/QtGui/qopenglwindow_test.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import QSize, QTimer, Qt
 from PySide2.QtGui import (QColor, QGuiApplication, QImage, QOpenGLContext,
diff --git a/sources/pyside2/tests/QtGui/qpdfwriter_test.py b/sources/pyside2/tests/QtGui/qpdfwriter_test.py
index 2ee748194..dbda66133 100644
--- a/sources/pyside2/tests/QtGui/qpdfwriter_test.py
+++ b/sources/pyside2/tests/QtGui/qpdfwriter_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 5689ca0e0..fb0c10611 100644
--- a/sources/pyside2/tests/QtGui/qpixelformat_test.py
+++ b/sources/pyside2/tests/QtGui/qpixelformat_test.py
@@ -34,7 +34,7 @@ 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.usesqapplication 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 575abb096..d59fa0281 100644
--- a/sources/pyside2/tests/QtGui/qpixmap_test.py
+++ b/sources/pyside2/tests/QtGui/qpixmap_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 d10dff36f..a0e8dc03c 100644
--- a/sources/pyside2/tests/QtGui/qpixmapcache_test.py
+++ b/sources/pyside2/tests/QtGui/qpixmapcache_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 bd1cf24ff..5bb13600b 100644
--- a/sources/pyside2/tests/QtGui/qrasterwindow_test.py
+++ b/sources/pyside2/tests/QtGui/qrasterwindow_test.py
@@ -34,7 +34,7 @@ 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.usesqapplication 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 beb622e6c..085fcec3a 100644
--- a/sources/pyside2/tests/QtGui/qregion_test.py
+++ b/sources/pyside2/tests/QtGui/qregion_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtGui import QRegion
 from PySide2.QtCore import QPoint
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QRegionTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtGui/qstylehints_test.py b/sources/pyside2/tests/QtGui/qstylehints_test.py
index 8f10005a9..a771d38f2 100644
--- a/sources/pyside2/tests/QtGui/qstylehints_test.py
+++ b/sources/pyside2/tests/QtGui/qstylehints_test.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtGui import QStyleHints
 
 class QStyleHintsTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtGui/qtextline_test.py b/sources/pyside2/tests/QtGui/qtextline_test.py
index b4185f05f..5abdc076b 100644
--- a/sources/pyside2/tests/QtGui/qtextline_test.py
+++ b/sources/pyside2/tests/QtGui/qtextline_test.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class QTextLineTest(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 1b33c6ff5..897310057 100644
--- a/sources/pyside2/tests/QtGui/timed_app_and_patching_test.py
+++ b/sources/pyside2/tests/QtGui/timed_app_and_patching_test.py
@@ -32,7 +32,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 from PySide2.support import deprecated
 from PySide2.support.signature import importhandler
 from PySide2 import QtGui
diff --git a/sources/pyside2/tests/QtHelp/help_test.py b/sources/pyside2/tests/QtHelp/help_test.py
index 54d5365b3..e99214d4b 100644
--- a/sources/pyside2/tests/QtHelp/help_test.py
+++ b/sources/pyside2/tests/QtHelp/help_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtHelp import QHelpEngine
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QHelpEngineCreation(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtHelp/helpsearchengine_test.py b/sources/pyside2/tests/QtHelp/helpsearchengine_test.py
index 69a7c5bfd..b81078b29 100644
--- a/sources/pyside2/tests/QtHelp/helpsearchengine_test.py
+++ b/sources/pyside2/tests/QtHelp/helpsearchengine_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtHelp import QHelpEngineCore, QHelpSearchEngine, QHelpSearchResult
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QHelpSearchEngineTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtMultimedia/audio_test.py b/sources/pyside2/tests/QtMultimedia/audio_test.py
index 2bcc7043d..97352988d 100644
--- a/sources/pyside2/tests/QtMultimedia/audio_test.py
+++ b/sources/pyside2/tests/QtMultimedia/audio_test.py
@@ -34,7 +34,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import UsesQGuiApplication
+from helper.usesqguiapplication 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 bf36ebe7e..99d4bba83 100644
--- a/sources/pyside2/tests/QtMultimediaWidgets/qmultimediawidgets.py
+++ b/sources/pyside2/tests/QtMultimediaWidgets/qmultimediawidgets.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtMultimediaWidgets import QGraphicsVideoItem, QVideoWidget
 from PySide2.QtWidgets import QGraphicsScene, QGraphicsView, QVBoxLayout, QWidget
 from PySide2.QtCore import QTimer
diff --git a/sources/pyside2/tests/QtNetwork/accessManager_test.py b/sources/pyside2/tests/QtNetwork/accessManager_test.py
index 81c6989c0..95c882d26 100644
--- a/sources/pyside2/tests/QtNetwork/accessManager_test.py
+++ b/sources/pyside2/tests/QtNetwork/accessManager_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import *
 from PySide2.QtNetwork import *
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 from httpd import TestServer
 
 class AccessManagerCase(UsesQCoreApplication):
diff --git a/sources/pyside2/tests/QtNetwork/bug_446.py b/sources/pyside2/tests/QtNetwork/bug_446.py
index 31e34d23f..91333ef7a 100644
--- a/sources/pyside2/tests/QtNetwork/bug_446.py
+++ b/sources/pyside2/tests/QtNetwork/bug_446.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import *
 from PySide2.QtNetwork import *
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 import py3kcompat as py3k
 
 class HttpSignalsCase(UsesQCoreApplication):
diff --git a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
index 7407a9de2..56812e0fa 100644
--- a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
+++ b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
@@ -39,7 +39,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QByteArray
 from PySide2.QtOpenGL import QGLBuffer, QGLWidget
 import py3kcompat as py3k
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QGLBufferTest(UsesQApplication):
     def testIt(self):
diff --git a/sources/pyside2/tests/QtPrintSupport/bug_500.py b/sources/pyside2/tests/QtPrintSupport/bug_500.py
index a7153bbb0..0a13da7d1 100644
--- a/sources/pyside2/tests/QtPrintSupport/bug_500.py
+++ b/sources/pyside2/tests/QtPrintSupport/bug_500.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import *
 from PySide2.QtPrintSupport import *
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class NeverDiesTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py b/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py
index 62e2f91fc..1ca9431c8 100644
--- a/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py
+++ b/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py
@@ -38,7 +38,7 @@ from PySide2.QtGui import QTextCursor
 from PySide2.QtPrintSupport import QPrinter, QPrinterInfo
 from PySide2.QtWidgets import QLayout, QWidget, QGraphicsLayout, QGraphicsLayoutItem
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Layout(QLayout):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtQml/bug_451.py b/sources/pyside2/tests/QtQml/bug_451.py
index b6d1da5d0..f6405ffc8 100644
--- a/sources/pyside2/tests/QtQml/bug_451.py
+++ b/sources/pyside2/tests/QtQml/bug_451.py
@@ -39,7 +39,7 @@ 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 helper.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 7ac2f21c2..0ecc012f8 100644
--- a/sources/pyside2/tests/QtQml/bug_456.py
+++ b/sources/pyside2/tests/QtQml/bug_456.py
@@ -32,7 +32,8 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import 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 a697bcd07..a8b330865 100644
--- a/sources/pyside2/tests/QtQml/bug_557.py
+++ b/sources/pyside2/tests/QtQml/bug_557.py
@@ -32,7 +32,7 @@ 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 helper.helper import adjust_filename
 
 from PySide2.QtCore import QUrl
 from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/bug_726.py b/sources/pyside2/tests/QtQml/bug_726.py
index e4854eab0..4594a43b6 100644
--- a/sources/pyside2/tests/QtQml/bug_726.py
+++ b/sources/pyside2/tests/QtQml/bug_726.py
@@ -32,7 +32,8 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import 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 5387cd1f5..5b38f134d 100644
--- a/sources/pyside2/tests/QtQml/bug_814.py
+++ b/sources/pyside2/tests/QtQml/bug_814.py
@@ -43,7 +43,8 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
 
 from PySide2.QtCore import QUrl, QAbstractListModel, QModelIndex, Qt
 from PySide2.QtQuick import QQuickView
diff --git a/sources/pyside2/tests/QtQml/bug_825.py b/sources/pyside2/tests/QtQml/bug_825.py
index 4592a0f24..fcf0fac28 100644
--- a/sources/pyside2/tests/QtQml/bug_825.py
+++ b/sources/pyside2/tests/QtQml/bug_825.py
@@ -32,7 +32,7 @@ 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 helper.helper import adjust_filename
 
 from PySide2.QtCore import Qt, QUrl, QTimer
 from PySide2.QtGui import QGuiApplication, QPen
diff --git a/sources/pyside2/tests/QtQml/bug_847.py b/sources/pyside2/tests/QtQml/bug_847.py
index b88bffefb..7347e1649 100644
--- a/sources/pyside2/tests/QtQml/bug_847.py
+++ b/sources/pyside2/tests/QtQml/bug_847.py
@@ -42,7 +42,8 @@ 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 helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import Slot, Signal, QUrl, QTimer, QCoreApplication
 from PySide2.QtQuick import QQuickView
diff --git a/sources/pyside2/tests/QtQml/bug_915.py b/sources/pyside2/tests/QtQml/bug_915.py
index 5e80fcc2f..74cc30d4c 100644
--- a/sources/pyside2/tests/QtQml/bug_915.py
+++ b/sources/pyside2/tests/QtQml/bug_915.py
@@ -35,7 +35,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import TimedQApplication
+from helper.timedqapplication 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 865e61129..2eb958d89 100644
--- a/sources/pyside2/tests/QtQml/bug_926.py
+++ b/sources/pyside2/tests/QtQml/bug_926.py
@@ -33,7 +33,7 @@ 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 helper.helper import adjust_filename
 
 from PySide2.QtCore import QUrl, QTimer, QObject, Signal, Property
 from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/bug_951.py b/sources/pyside2/tests/QtQml/bug_951.py
index 16399e62b..2223b2a50 100644
--- a/sources/pyside2/tests/QtQml/bug_951.py
+++ b/sources/pyside2/tests/QtQml/bug_951.py
@@ -32,7 +32,8 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
 
 from PySide2.QtCore import QUrl
 from PySide2.QtQml import qmlRegisterType
diff --git a/sources/pyside2/tests/QtQml/bug_995.py b/sources/pyside2/tests/QtQml/bug_995.py
index 2ffc38c9e..9a83a8110 100644
--- a/sources/pyside2/tests/QtQml/bug_995.py
+++ b/sources/pyside2/tests/QtQml/bug_995.py
@@ -32,7 +32,8 @@ 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 helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
 
 from PySide2.QtGui import QGuiApplication
 from PySide2.QtQuick import QQuickView
diff --git a/sources/pyside2/tests/QtQml/bug_997.py b/sources/pyside2/tests/QtQml/bug_997.py
index fdb6c6c8d..9d4efff71 100644
--- a/sources/pyside2/tests/QtQml/bug_997.py
+++ b/sources/pyside2/tests/QtQml/bug_997.py
@@ -32,7 +32,8 @@ 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 helper.helper import adjust_filename
+from helper.usesqapplication import 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 6e265ae3c..31569b7aa 100644
--- a/sources/pyside2/tests/QtQml/connect_python_qml.py
+++ b/sources/pyside2/tests/QtQml/connect_python_qml.py
@@ -39,7 +39,8 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import 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 fc7aba205..2cf81fc80 100644
--- a/sources/pyside2/tests/QtQml/javascript_exceptions.py
+++ b/sources/pyside2/tests/QtQml/javascript_exceptions.py
@@ -32,7 +32,8 @@ 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 helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import Slot, Property, Signal, QObject, QUrl
 from PySide2.QtQml import QJSEngine, qmlRegisterType
diff --git a/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py b/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
index 9adcdcaf7..281646545 100644
--- a/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
+++ b/sources/pyside2/tests/QtQml/qqmlincubator_incubateWhile.py
@@ -35,7 +35,7 @@ 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 helper.helper import adjust_filename
 
 from PySide2.QtCore import QObject, QUrl, Slot, QTimer
 from PySide2.QtGui import QGuiApplication
diff --git a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
index 74c87eac5..4ea5f8d19 100644
--- a/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
+++ b/sources/pyside2/tests/QtQml/qqmlnetwork_test.py
@@ -41,7 +41,9 @@ from PySide2.QtQuick import QQuickView
 from PySide2.QtQml import QQmlNetworkAccessManagerFactory
 from PySide2.QtNetwork import QNetworkAccessManager
 
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
+
 
 class CustomManager(QNetworkAccessManager):
     def createRequest(self, op, req, data = None):
diff --git a/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py b/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
index 8e7e07997..a9618a92a 100644
--- a/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
+++ b/sources/pyside2/tests/QtQml/qquickitem_grabToImage.py
@@ -32,7 +32,9 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
+
 from PySide2 import QtCore, QtGui, QtQuick
 
 class TestGrabToSharedPointerImage(TimedQApplication):
diff --git a/sources/pyside2/tests/QtQml/qquickview_test.py b/sources/pyside2/tests/QtQml/qquickview_test.py
index 6edaf64e0..e0b35dc59 100644
--- a/sources/pyside2/tests/QtQml/qquickview_test.py
+++ b/sources/pyside2/tests/QtQml/qquickview_test.py
@@ -34,7 +34,8 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
 
 from PySide2.QtCore import QUrl, QObject, Property, Slot
 from PySide2.QtQml import QtQml
diff --git a/sources/pyside2/tests/QtQml/registertype.py b/sources/pyside2/tests/QtQml/registertype.py
index 32d93830e..be15b87e8 100644
--- a/sources/pyside2/tests/QtQml/registertype.py
+++ b/sources/pyside2/tests/QtQml/registertype.py
@@ -32,7 +32,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-import helper
+from helper.helper import adjust_filename
 
 from PySide2.QtCore import Property, QTimer, QUrl
 from PySide2.QtGui import QGuiApplication, QPen, QColor, QPainter
@@ -110,7 +110,7 @@ class TestQmlSupport(unittest.TestCase):
         qmlRegisterType(PieSlice, "Charts", 1, 0, "PieSlice");
 
         view = QQuickView()
-        view.setSource(QUrl.fromLocalFile(helper.adjust_filename('registertype.qml', __file__)))
+        view.setSource(QUrl.fromLocalFile(adjust_filename('registertype.qml', __file__)))
         view.show()
         QTimer.singleShot(250, view.close)
         app.exec_()
diff --git a/sources/pyside2/tests/QtQml/signal_arguments.py b/sources/pyside2/tests/QtQml/signal_arguments.py
index d527e72e1..d46a34fcb 100644
--- a/sources/pyside2/tests/QtQml/signal_arguments.py
+++ b/sources/pyside2/tests/QtQml/signal_arguments.py
@@ -32,7 +32,9 @@ 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 helper.helper import adjust_filename
+from helper.timedqapplication import 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 4b2365751..e5f2a0734 100644
--- a/sources/pyside2/tests/QtScript/qscriptvalue_test.py
+++ b/sources/pyside2/tests/QtScript/qscriptvalue_test.py
@@ -39,7 +39,7 @@ from PySide2.QtScript import *
 # Required for eval() to work
 import PySide2.QtScript
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class TestQScriptValue (UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtScriptTools/debugger_test.py b/sources/pyside2/tests/QtScriptTools/debugger_test.py
index eed26bd20..a5ec8867a 100644
--- a/sources/pyside2/tests/QtScriptTools/debugger_test.py
+++ b/sources/pyside2/tests/QtScriptTools/debugger_test.py
@@ -36,7 +36,7 @@ from PySide2.QtCore import SIGNAL, QTimer
 from PySide2.QtScript import QScriptEngine
 from PySide2.QtScriptTools import QScriptEngineDebugger
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class DebuggerTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtScxml/test_dynamic.py b/sources/pyside2/tests/QtScxml/test_dynamic.py
index d0851c714..2a9ad97df 100644
--- a/sources/pyside2/tests/QtScxml/test_dynamic.py
+++ b/sources/pyside2/tests/QtScxml/test_dynamic.py
@@ -32,7 +32,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 from PySide2.QtCore import QObject, SIGNAL
 from PySide2.QtScxml import QScxmlStateMachine
 
diff --git a/sources/pyside2/tests/QtTest/click_test.py b/sources/pyside2/tests/QtTest/click_test.py
index 64a3513cc..48b01e30c 100644
--- a/sources/pyside2/tests/QtTest/click_test.py
+++ b/sources/pyside2/tests/QtTest/click_test.py
@@ -38,7 +38,7 @@ from PySide2.QtCore import Qt, QObject
 from PySide2.QtWidgets import QPushButton, QLineEdit
 from PySide2.QtTest import QTest
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MouseClickTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtTest/eventfilter_test.py b/sources/pyside2/tests/QtTest/eventfilter_test.py
index d478d143c..c087e2550 100644
--- a/sources/pyside2/tests/QtTest/eventfilter_test.py
+++ b/sources/pyside2/tests/QtTest/eventfilter_test.py
@@ -39,7 +39,7 @@ from PySide2.QtGui import QKeyEvent
 from PySide2.QtWidgets import QLineEdit
 from PySide2.QtTest import QTest
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 class KeyEventFilter(QObject):
diff --git a/sources/pyside2/tests/QtTest/qvalidator_test.py b/sources/pyside2/tests/QtTest/qvalidator_test.py
index f6a0fee9a..d3ac5571f 100644
--- a/sources/pyside2/tests/QtTest/qvalidator_test.py
+++ b/sources/pyside2/tests/QtTest/qvalidator_test.py
@@ -37,7 +37,7 @@ from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 from PySide2.QtTest import *
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MyValidator1(QValidator):
     def fixup(self, input):
diff --git a/sources/pyside2/tests/QtTest/touchevent_test.py b/sources/pyside2/tests/QtTest/touchevent_test.py
index 641d2e917..0105ac684 100644
--- a/sources/pyside2/tests/QtTest/touchevent_test.py
+++ b/sources/pyside2/tests/QtTest/touchevent_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtWidgets import QWidget
 from PySide2.QtCore import QPoint, QTimer, Qt, QEvent
diff --git a/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py b/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py
index 5294f609c..6bf8f85b1 100644
--- a/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py
+++ b/sources/pyside2/tests/QtTextToSpeech/qtexttospeech_test.py
@@ -36,7 +36,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import QTimer
 
diff --git a/sources/pyside2/tests/QtUiTools/bug_1060.py b/sources/pyside2/tests/QtUiTools/bug_1060.py
index 92736d785..22da11a82 100644
--- a/sources/pyside2/tests/QtUiTools/bug_1060.py
+++ b/sources/pyside2/tests/QtUiTools/bug_1060.py
@@ -33,7 +33,7 @@ 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 helper.helper import adjust_filename
 from PySide2.QtWidgets import QApplication
 from PySide2.QtUiTools import QUiLoader
 
diff --git a/sources/pyside2/tests/QtUiTools/bug_360.py b/sources/pyside2/tests/QtUiTools/bug_360.py
index 4043c88ae..6af5ff49d 100644
--- a/sources/pyside2/tests/QtUiTools/bug_360.py
+++ b/sources/pyside2/tests/QtUiTools/bug_360.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2 import QtCore, QtWidgets
 from PySide2.QtUiTools import QUiLoader
diff --git a/sources/pyside2/tests/QtUiTools/bug_376.py b/sources/pyside2/tests/QtUiTools/bug_376.py
index a40f9c2ac..1da380fd3 100644
--- a/sources/pyside2/tests/QtUiTools/bug_376.py
+++ b/sources/pyside2/tests/QtUiTools/bug_376.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2 import QtCore, QtWidgets
 from PySide2.QtUiTools import QUiLoader
diff --git a/sources/pyside2/tests/QtUiTools/bug_392.py b/sources/pyside2/tests/QtUiTools/bug_392.py
index f5d096e75..9b5782f2b 100644
--- a/sources/pyside2/tests/QtUiTools/bug_392.py
+++ b/sources/pyside2/tests/QtUiTools/bug_392.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2 import QtWidgets
 from PySide2.QtUiTools import QUiLoader
diff --git a/sources/pyside2/tests/QtUiTools/bug_552.py b/sources/pyside2/tests/QtUiTools/bug_552.py
index c395b37d1..7a0530897 100644
--- a/sources/pyside2/tests/QtUiTools/bug_552.py
+++ b/sources/pyside2/tests/QtUiTools/bug_552.py
@@ -32,7 +32,7 @@ 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 helper.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 487645416..0fb7ed435 100644
--- a/sources/pyside2/tests/QtUiTools/bug_797.py
+++ b/sources/pyside2/tests/QtUiTools/bug_797.py
@@ -32,7 +32,7 @@ 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 helper.helper import adjust_filename
 
 from PySide2 import QtUiTools
 from PySide2 import QtCore
diff --git a/sources/pyside2/tests/QtUiTools/bug_909.py b/sources/pyside2/tests/QtUiTools/bug_909.py
index 822dcba29..5c9c12521 100644
--- a/sources/pyside2/tests/QtUiTools/bug_909.py
+++ b/sources/pyside2/tests/QtUiTools/bug_909.py
@@ -36,8 +36,8 @@ from PySide2.QtCore import QFile
 from PySide2.QtWidgets import QTabWidget
 from PySide2.QtUiTools import QUiLoader
 
-from helper import UsesQApplication
-from helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
+from helper.helper import adjust_filename
 
 class TestDestruction(UsesQApplication):
     def testBug909(self):
diff --git a/sources/pyside2/tests/QtUiTools/bug_913.py b/sources/pyside2/tests/QtUiTools/bug_913.py
index 9d2331a8a..b0a871b8b 100644
--- a/sources/pyside2/tests/QtUiTools/bug_913.py
+++ b/sources/pyside2/tests/QtUiTools/bug_913.py
@@ -35,7 +35,7 @@ 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 helper.helper import adjust_filename
 
 from PySide2.QtCore import *
 from PySide2.QtWidgets import *
diff --git a/sources/pyside2/tests/QtUiTools/bug_958.py b/sources/pyside2/tests/QtUiTools/bug_958.py
index 0ffea229c..f631d36e3 100644
--- a/sources/pyside2/tests/QtUiTools/bug_958.py
+++ b/sources/pyside2/tests/QtUiTools/bug_958.py
@@ -33,8 +33,8 @@ 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
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
 
 class Gui_Qt(QtWidgets.QMainWindow):
     def __init__(self, parent=None):
diff --git a/sources/pyside2/tests/QtUiTools/bug_965.py b/sources/pyside2/tests/QtUiTools/bug_965.py
index 707a1bb6a..a8fabe727 100644
--- a/sources/pyside2/tests/QtUiTools/bug_965.py
+++ b/sources/pyside2/tests/QtUiTools/bug_965.py
@@ -33,8 +33,8 @@ 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
+from helper.usesqapplication import UsesQApplication
+from helper.helper import adjust_filename
 
 class MyQUiLoader(QUiLoader):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtUiTools/ui_test.py b/sources/pyside2/tests/QtUiTools/ui_test.py
index d67c9b007..2fe78fba4 100644
--- a/sources/pyside2/tests/QtUiTools/ui_test.py
+++ b/sources/pyside2/tests/QtUiTools/ui_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtUiTools import QUiLoader
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QUiLoaderCreation(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtUiTools/uiloader_test.py b/sources/pyside2/tests/QtUiTools/uiloader_test.py
index 004f2dc56..4f5881719 100644
--- a/sources/pyside2/tests/QtUiTools/uiloader_test.py
+++ b/sources/pyside2/tests/QtUiTools/uiloader_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtWidgets import QWidget
 from PySide2.QtUiTools import QUiLoader
diff --git a/sources/pyside2/tests/QtWebKit/bug_899.py b/sources/pyside2/tests/QtWebKit/bug_899.py
index ad6fc68ba..681210444 100644
--- a/sources/pyside2/tests/QtWebKit/bug_899.py
+++ b/sources/pyside2/tests/QtWebKit/bug_899.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import Property, QObject
 from PySide2.QtWebKit import QWebView
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 
 class TestLambdaPropery(TimedQApplication):
 
diff --git a/sources/pyside2/tests/QtWebKit/bug_959.py b/sources/pyside2/tests/QtWebKit/bug_959.py
index 6750acff2..6ddf25540 100644
--- a/sources/pyside2/tests/QtWebKit/bug_959.py
+++ b/sources/pyside2/tests/QtWebKit/bug_959.py
@@ -37,7 +37,7 @@ 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.usesqapplication import UsesQApplication
 
 functionID = -1
 currentWebView = None
diff --git a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
index 6002884f2..5cb6cee57 100644
--- a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
+++ b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
@@ -36,7 +36,7 @@ from PySide2.QtCore import QUrl, QTimer
 from PySide2.QtWidgets import QApplication, QLabel
 from PySide2.QtWebKit import QWebPluginFactory, QWebView, QWebSettings
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class PluginFactory(QWebPluginFactory):
 
diff --git a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
index d6bd52a3c..aeee109d0 100644
--- a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
+++ b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import Property, QObject
 from PySide2.QtWebKit import QWebView
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 
 class TestLoadFinished(TimedQApplication):
 
diff --git a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
index b8f21d48f..722fc63d1 100644
--- a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
+++ b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2 import QtCore, QtWebKit
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QWebPageHeadless(QtWebKit.QWebPage):
     # FIXME: This is not working, the slot is not overriden!
diff --git a/sources/pyside2/tests/QtWebKit/webframe_test.py b/sources/pyside2/tests/QtWebKit/webframe_test.py
index 455d0a8e7..b92174c80 100644
--- a/sources/pyside2/tests/QtWebKit/webframe_test.py
+++ b/sources/pyside2/tests/QtWebKit/webframe_test.py
@@ -36,8 +36,8 @@ from PySide2.QtCore import QObject, SIGNAL, QUrl
 from PySide2.QtWebKit import *
 from PySide2.QtNetwork import QNetworkRequest
 
-from helper import adjust_filename, UsesQApplication
-
+from helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
 
 
 class TestWebFrame(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWebKit/webpage_test.py b/sources/pyside2/tests/QtWebKit/webpage_test.py
index 3ed6fa89d..22ad1ff9f 100644
--- a/sources/pyside2/tests/QtWebKit/webpage_test.py
+++ b/sources/pyside2/tests/QtWebKit/webpage_test.py
@@ -38,7 +38,8 @@ from PySide2.QtCore import QObject, SIGNAL, QUrl
 from PySide2.QtWebKit import QWebPage
 from PySide2.QtNetwork import QNetworkAccessManager
 
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
 
 #Define a global timeout because TimedQApplication uses a singleton!
 #Use a value big enough to run all the tests.
diff --git a/sources/pyside2/tests/QtWebKit/webview_test.py b/sources/pyside2/tests/QtWebKit/webview_test.py
index 50f20c40d..06e5b7d0f 100644
--- a/sources/pyside2/tests/QtWebKit/webview_test.py
+++ b/sources/pyside2/tests/QtWebKit/webview_test.py
@@ -40,7 +40,8 @@ from PySide2.QtCore import QObject, SIGNAL, QUrl
 from PySide2.QtWebKit import QWebPage, QWebView
 from PySide2.QtNetwork import QNetworkRequest
 
-from helper import adjust_filename, TimedQApplication
+from helper.helper import adjust_filename
+from helper.timedqapplication import TimedQApplication
 
 
 class testWebPage(QWebPage):
diff --git a/sources/pyside2/tests/QtWidgets/action_clear.py b/sources/pyside2/tests/QtWidgets/action_clear.py
index 2e9c8c720..b8a6ad590 100644
--- a/sources/pyside2/tests/QtWidgets/action_clear.py
+++ b/sources/pyside2/tests/QtWidgets/action_clear.py
@@ -34,7 +34,7 @@ import weakref
 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
+from helper.usesqapplication import UsesQApplication
 
 
 class TestQActionLifeCycle(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/add_action_test.py b/sources/pyside2/tests/QtWidgets/add_action_test.py
index 9fdeccd27..1dbc5d549 100644
--- a/sources/pyside2/tests/QtWidgets/add_action_test.py
+++ b/sources/pyside2/tests/QtWidgets/add_action_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import SLOT
 from PySide2.QtWidgets import QMenuBar, QAction, QPushButton
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 class AddActionTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/api2_test.py b/sources/pyside2/tests/QtWidgets/api2_test.py
index 27fdbcdda..151ebb9fc 100644
--- a/sources/pyside2/tests/QtWidgets/api2_test.py
+++ b/sources/pyside2/tests/QtWidgets/api2_test.py
@@ -40,7 +40,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtGui import QIntValidator, QValidator
 from PySide2.QtWidgets import QWidget, QSpinBox, QApplication
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class WidgetValidatorQInt(QWidget, QIntValidator):
     def __init__(self, parent=None):
diff --git a/sources/pyside2/tests/QtWidgets/bug_1002.py b/sources/pyside2/tests/QtWidgets/bug_1002.py
index d05317dfd..c25209d2a 100644
--- a/sources/pyside2/tests/QtWidgets/bug_1002.py
+++ b/sources/pyside2/tests/QtWidgets/bug_1002.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtWidgets import QWidget, QPushButton
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class TestBug1002 (UsesQApplication):
     def testReturnWindow(self):
diff --git a/sources/pyside2/tests/QtWidgets/bug_1006.py b/sources/pyside2/tests/QtWidgets/bug_1006.py
index f8a85303f..8b7ab7802 100644
--- a/sources/pyside2/tests/QtWidgets/bug_1006.py
+++ b/sources/pyside2/tests/QtWidgets/bug_1006.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QDialog, QLabel, QGridLayout, QHBoxLayout, QWidget
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 
 class LabelWindow(QDialog):
     def __init__(self, parent):
diff --git a/sources/pyside2/tests/QtWidgets/bug_363.py b/sources/pyside2/tests/QtWidgets/bug_363.py
index 0e15eb5bd..a5abb4dbf 100644
--- a/sources/pyside2/tests/QtWidgets/bug_363.py
+++ b/sources/pyside2/tests/QtWidgets/bug_363.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2 import QtCore, QtWidgets
 
 # Check for desktop object lifetime
diff --git a/sources/pyside2/tests/QtWidgets/bug_389.py b/sources/pyside2/tests/QtWidgets/bug_389.py
index ca4b01521..bd18705a6 100644
--- a/sources/pyside2/tests/QtWidgets/bug_389.py
+++ b/sources/pyside2/tests/QtWidgets/bug_389.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2 import QtCore, QtGui, QtWidgets
 
 class BugTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/bug_400.py b/sources/pyside2/tests/QtWidgets/bug_400.py
index f696c9f8f..e98ce3d22 100644
--- a/sources/pyside2/tests/QtWidgets/bug_400.py
+++ b/sources/pyside2/tests/QtWidgets/bug_400.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtWidgets import QTreeWidgetItemIterator, QTreeWidgetItem, QTreeWidget
 
 class BugTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/bug_416.py b/sources/pyside2/tests/QtWidgets/bug_416.py
index f15cff508..f88f3965b 100644
--- a/sources/pyside2/tests/QtWidgets/bug_416.py
+++ b/sources/pyside2/tests/QtWidgets/bug_416.py
@@ -34,7 +34,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import TimedQApplication
+from helper.timedqapplication 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 2eb29e08e..d26b4424c 100644
--- a/sources/pyside2/tests/QtWidgets/bug_467.py
+++ b/sources/pyside2/tests/QtWidgets/bug_467.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtWidgets import QMainWindow, QApplication
 
 class MyWidget(QMainWindow):
diff --git a/sources/pyside2/tests/QtWidgets/bug_512.py b/sources/pyside2/tests/QtWidgets/bug_512.py
index cb5f62b76..5d1cab9bb 100644
--- a/sources/pyside2/tests/QtWidgets/bug_512.py
+++ b/sources/pyside2/tests/QtWidgets/bug_512.py
@@ -34,7 +34,7 @@ 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.usesqapplication 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 32e6bf313..4627d8042 100644
--- a/sources/pyside2/tests/QtWidgets/bug_688.py
+++ b/sources/pyside2/tests/QtWidgets/bug_688.py
@@ -34,7 +34,7 @@ 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.usesqapplication 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 51c10fc41..5af193ffc 100644
--- a/sources/pyside2/tests/QtWidgets/bug_696.py
+++ b/sources/pyside2/tests/QtWidgets/bug_696.py
@@ -34,7 +34,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtWidgets import QMainWindow, QMenu, QApplication
 
 class MainWindow(QMainWindow):
diff --git a/sources/pyside2/tests/QtWidgets/bug_722.py b/sources/pyside2/tests/QtWidgets/bug_722.py
index d465b84e3..1cdf7ff43 100644
--- a/sources/pyside2/tests/QtWidgets/bug_722.py
+++ b/sources/pyside2/tests/QtWidgets/bug_722.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 e3a103d40..42b6c9843 100644
--- a/sources/pyside2/tests/QtWidgets/bug_750.py
+++ b/sources/pyside2/tests/QtWidgets/bug_750.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import QTimer
 from PySide2.QtGui import QPainter, QFont, QFontInfo
diff --git a/sources/pyside2/tests/QtWidgets/bug_778.py b/sources/pyside2/tests/QtWidgets/bug_778.py
index b99cc2bd1..c5615b06f 100644
--- a/sources/pyside2/tests/QtWidgets/bug_778.py
+++ b/sources/pyside2/tests/QtWidgets/bug_778.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 b02059836..aa0ebfae5 100644
--- a/sources/pyside2/tests/QtWidgets/bug_811.py
+++ b/sources/pyside2/tests/QtWidgets/bug_811.py
@@ -33,7 +33,7 @@ import weakref
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 from PySide2.QtGui import QTextBlockUserData, QTextCursor
 from PySide2.QtWidgets import QTextEdit
diff --git a/sources/pyside2/tests/QtWidgets/bug_854.py b/sources/pyside2/tests/QtWidgets/bug_854.py
index 7b1904914..60d843b64 100644
--- a/sources/pyside2/tests/QtWidgets/bug_854.py
+++ b/sources/pyside2/tests/QtWidgets/bug_854.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtWidgets import QTableView, QVBoxLayout, QApplication
 from PySide2.QtCore import QAbstractItemModel
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 class VirtualList(QAbstractItemModel):
diff --git a/sources/pyside2/tests/QtWidgets/bug_860.py b/sources/pyside2/tests/QtWidgets/bug_860.py
index 191d1c06c..7440b2613 100644
--- a/sources/pyside2/tests/QtWidgets/bug_860.py
+++ b/sources/pyside2/tests/QtWidgets/bug_860.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QSignalMapper
 from PySide2.QtWidgets import QCheckBox
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MultipleSlotTest(UsesQApplication):
     def cb_changed(self, i):
diff --git a/sources/pyside2/tests/QtWidgets/bug_871.py b/sources/pyside2/tests/QtWidgets/bug_871.py
index b224d02f3..a3759cb97 100644
--- a/sources/pyside2/tests/QtWidgets/bug_871.py
+++ b/sources/pyside2/tests/QtWidgets/bug_871.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 737ce3a92..4ef133fa3 100644
--- a/sources/pyside2/tests/QtWidgets/bug_919.py
+++ b/sources/pyside2/tests/QtWidgets/bug_919.py
@@ -32,7 +32,7 @@ import unittest
 
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "util"))
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 from PySide2.QtCore import Signal, QTimer
 from PySide2.QtGui import QPainter
 from PySide2.QtWidgets import QPushButton, QStyleOptionButton, QApplication, QStyle
diff --git a/sources/pyside2/tests/QtWidgets/bug_921.py b/sources/pyside2/tests/QtWidgets/bug_921.py
index b70d9f428..9380a08f1 100644
--- a/sources/pyside2/tests/QtWidgets/bug_921.py
+++ b/sources/pyside2/tests/QtWidgets/bug_921.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2 import QtCore, QtWidgets
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 
 class Signaller(QtCore.QObject):
     s1 = QtCore.Signal()
diff --git a/sources/pyside2/tests/QtWidgets/bug_972.py b/sources/pyside2/tests/QtWidgets/bug_972.py
index f77c7d5ca..a5299eebc 100644
--- a/sources/pyside2/tests/QtWidgets/bug_972.py
+++ b/sources/pyside2/tests/QtWidgets/bug_972.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QSizeF
 from PySide2.QtWidgets import QGraphicsProxyWidget, QSizePolicy, QPushButton, QGraphicsScene, QGraphicsView
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 
 def createItem(minimum, preferred, maximum, name):
     w = QGraphicsProxyWidget()
diff --git a/sources/pyside2/tests/QtWidgets/customproxywidget_test.py b/sources/pyside2/tests/QtWidgets/customproxywidget_test.py
index 7446a45f5..051f31a71 100644
--- a/sources/pyside2/tests/QtWidgets/customproxywidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/customproxywidget_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtCore import Qt, QTimer
 from PySide2.QtGui import QPainter
 from PySide2.QtWidgets import QLabel
diff --git a/sources/pyside2/tests/QtWidgets/event_filter_test.py b/sources/pyside2/tests/QtWidgets/event_filter_test.py
index 104631235..a367c0349 100644
--- a/sources/pyside2/tests/QtWidgets/event_filter_test.py
+++ b/sources/pyside2/tests/QtWidgets/event_filter_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtCore import QObject, QEvent
 from PySide2.QtWidgets import QWidget
 
diff --git a/sources/pyside2/tests/QtWidgets/grandparent_method_test.py b/sources/pyside2/tests/QtWidgets/grandparent_method_test.py
index e9f1c62f6..6e64a047b 100644
--- a/sources/pyside2/tests/QtWidgets/grandparent_method_test.py
+++ b/sources/pyside2/tests/QtWidgets/grandparent_method_test.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtWidgets import QPushButton, QWidget
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Dummy(QPushButton):
 
diff --git a/sources/pyside2/tests/QtWidgets/hashabletype_test.py b/sources/pyside2/tests/QtWidgets/hashabletype_test.py
index 9deeef101..356afd8b9 100644
--- a/sources/pyside2/tests/QtWidgets/hashabletype_test.py
+++ b/sources/pyside2/tests/QtWidgets/hashabletype_test.py
@@ -35,7 +35,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class HashableTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/keep_reference_test.py b/sources/pyside2/tests/QtWidgets/keep_reference_test.py
index ef32e198e..c250da24b 100644
--- a/sources/pyside2/tests/QtWidgets/keep_reference_test.py
+++ b/sources/pyside2/tests/QtWidgets/keep_reference_test.py
@@ -35,7 +35,7 @@ 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 helper.usesqapplication import UsesQApplication
 from PySide2.QtCore import *
 from PySide2.QtWidgets import QTableView
 
diff --git a/sources/pyside2/tests/QtWidgets/paint_event_test.py b/sources/pyside2/tests/QtWidgets/paint_event_test.py
index 419b17b1e..1b715ce27 100644
--- a/sources/pyside2/tests/QtWidgets/paint_event_test.py
+++ b/sources/pyside2/tests/QtWidgets/paint_event_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QTimerEvent
 from PySide2.QtWidgets import QApplication, QWidget
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MyWidget(QWidget):
     '''Sample widget'''
diff --git a/sources/pyside2/tests/QtWidgets/parent_method_test.py b/sources/pyside2/tests/QtWidgets/parent_method_test.py
index 6fcf4b807..2f00a72d1 100644
--- a/sources/pyside2/tests/QtWidgets/parent_method_test.py
+++ b/sources/pyside2/tests/QtWidgets/parent_method_test.py
@@ -39,7 +39,7 @@ class Foo(QTableView):
     def __init__(self, parent=None):
         QTableView.__init__(self, parent)
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class TestParentType(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py b/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py
index 484e545c3..c08c9e95b 100644
--- a/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qabstracttextdocumentlayout_test.py
@@ -37,7 +37,7 @@ import py3kcompat as py3k
 from PySide2.QtCore import QSizeF, QTimer
 from PySide2.QtGui import QTextFormat, QTextCharFormat, QPyTextObject
 from PySide2.QtWidgets import QTextEdit
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Foo(QPyTextObject):
     called = False
diff --git a/sources/pyside2/tests/QtWidgets/qaction_test.py b/sources/pyside2/tests/QtWidgets/qaction_test.py
index 80fefa5b6..7ee74fffa 100644
--- a/sources/pyside2/tests/QtWidgets/qaction_test.py
+++ b/sources/pyside2/tests/QtWidgets/qaction_test.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class QPainterDrawText(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qbrush_test.py b/sources/pyside2/tests/QtWidgets/qbrush_test.py
index 57d7b048c..78f32c7bc 100644
--- a/sources/pyside2/tests/QtWidgets/qbrush_test.py
+++ b/sources/pyside2/tests/QtWidgets/qbrush_test.py
@@ -38,7 +38,7 @@ from PySide2.QtCore import Qt
 from PySide2.QtGui import QColor, QBrush
 from PySide2.QtWidgets import QApplication
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Constructor(UsesQApplication):
     '''Test case for constructor of QBrush'''
diff --git a/sources/pyside2/tests/QtWidgets/qcolormap_test.py b/sources/pyside2/tests/QtWidgets/qcolormap_test.py
index d3e0bf4d9..6166b32fb 100644
--- a/sources/pyside2/tests/QtWidgets/qcolormap_test.py
+++ b/sources/pyside2/tests/QtWidgets/qcolormap_test.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 
 class QColormapTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/qdynamic_signal.py b/sources/pyside2/tests/QtWidgets/qdynamic_signal.py
index f5a34f591..3b14ab3fb 100644
--- a/sources/pyside2/tests/QtWidgets/qdynamic_signal.py
+++ b/sources/pyside2/tests/QtWidgets/qdynamic_signal.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QObject
 from PySide2.QtWidgets import QInputDialog
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class DynamicSignalTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
index ec28beab3..97fe9d797 100644
--- a/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
+++ b/sources/pyside2/tests/QtWidgets/qfontdialog_test.py
@@ -36,7 +36,7 @@ from PySide2 import QtCore
 from PySide2 import QtGui
 from PySide2 import QtWidgets
 
-from helper import TimedQApplication
+from helper.timedqapplication import TimedQApplication
 
 class TestFontDialog(TimedQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qformlayout_test.py b/sources/pyside2/tests/QtWidgets/qformlayout_test.py
index ee1c89106..0b38f675d 100644
--- a/sources/pyside2/tests/QtWidgets/qformlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qformlayout_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtWidgets import QFormLayout, QWidget
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QFormLayoutTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
index 1de8eb1f1..524ca6fa8 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsitem_isblocked_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2 import QtCore
 from PySide2 import QtGui
 from PySide2 import QtWidgets
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Item(QtWidgets.QGraphicsItem):
 
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py
index 53f48c9f5..8787b6178 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsitem_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtGui import QPolygonF, QColor, QBrush
 from PySide2.QtWidgets import QGraphicsScene
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QColorOnSetBrush(UsesQApplication):
     '''Test case for passing a QColor directly to setBrush'''
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py
index cbdb3a2ea..11825e42e 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtWidgets import QGraphicsObject, QGraphicsWidget
 from PySide2.QtCore import QRectF
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class GObjA(QGraphicsObject):
     def paint(self, *args):
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py
index b31a272ec..59796142d 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsproxywidget_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtCore import Qt, QTimer
 from PySide2.QtGui import QPainter
 from PySide2.QtWidgets import QLabel
diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py
index 40c7abd4e..8c521369d 100644
--- a/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py
+++ b/sources/pyside2/tests/QtWidgets/qgraphicsscene_test.py
@@ -45,7 +45,7 @@ from PySide2.QtWidgets import QGraphicsPolygonItem, QGraphicsRectItem
 from PySide2.QtWidgets import QGraphicsSimpleTextItem, QGraphicsTextItem
 from PySide2.QtWidgets import QGraphicsProxyWidget, QGraphicsView
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Constructor(unittest.TestCase):
     '''QGraphicsScene constructor'''
diff --git a/sources/pyside2/tests/QtWidgets/qimage_test.py b/sources/pyside2/tests/QtWidgets/qimage_test.py
index c79f049cf..51f4fcd57 100644
--- a/sources/pyside2/tests/QtWidgets/qimage_test.py
+++ b/sources/pyside2/tests/QtWidgets/qimage_test.py
@@ -37,7 +37,8 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 import py3kcompat as py3k
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
-from helper import UsesQApplication, adjust_filename
+from helper.helper import adjust_filename
+from helper.usesqapplication import UsesQApplication
 
 xpm = [
     "27 22 206 2",
diff --git a/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py b/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py
index 79486882f..69d1613b6 100644
--- a/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py
+++ b/sources/pyside2/tests/QtWidgets/qinputdialog_get_test.py
@@ -33,7 +33,7 @@ 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
+from helper.timedqapplication import TimedQApplication
 
 class TestInputDialog(TimedQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py b/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py
index 803d77eca..d85d20aa2 100644
--- a/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py
+++ b/sources/pyside2/tests/QtWidgets/qkeysequenceedit_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QTimer
 from PySide2.QtWidgets import QKeySequenceEdit
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QKeySequenceEditTest(UsesQApplication):
     def testKeySequence(self):
diff --git a/sources/pyside2/tests/QtWidgets/qlabel_test.py b/sources/pyside2/tests/QtWidgets/qlabel_test.py
index 9d84b5c17..c8e8e2619 100644
--- a/sources/pyside2/tests/QtWidgets/qlabel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlabel_test.py
@@ -34,7 +34,7 @@ from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QLabel
 import shiboken2 as shiboken
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QLabelTest(UsesQApplication):
     '''Test case for calling QLabel.setPixmap'''
diff --git a/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py b/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py
index 79595693f..09b808794 100644
--- a/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlayout_ref_test.py
@@ -39,7 +39,7 @@ from PySide2.QtWidgets import QHBoxLayout, QVBoxLayout, QGridLayout, QWidget
 from PySide2.QtWidgets import QStackedLayout, QFormLayout
 from PySide2.QtWidgets import QApplication, QPushButton, QLabel
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class SaveReference(UsesQApplication):
     '''Test case to check if QLayout-derived classes increment the refcount
diff --git a/sources/pyside2/tests/QtWidgets/qlayout_test.py b/sources/pyside2/tests/QtWidgets/qlayout_test.py
index 694696ceb..8077e3bd3 100644
--- a/sources/pyside2/tests/QtWidgets/qlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlayout_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtCore import *
 from PySide2.QtWidgets import *
 
diff --git a/sources/pyside2/tests/QtWidgets/qlistwidget_test.py b/sources/pyside2/tests/QtWidgets/qlistwidget_test.py
index c0ece9048..6fab3fb34 100644
--- a/sources/pyside2/tests/QtWidgets/qlistwidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlistwidget_test.py
@@ -33,7 +33,7 @@ import unittest
 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
+from helper.usesqapplication import UsesQApplication
 
 class QListWidgetTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py b/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py
index e6b2577c1..2da159bce 100644
--- a/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlistwidgetitem_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2 import QtWidgets
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QListWidgetItemConstructor(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qmainwindow_test.py b/sources/pyside2/tests/QtWidgets/qmainwindow_test.py
index 64a89f905..50c992f1a 100644
--- a/sources/pyside2/tests/QtWidgets/qmainwindow_test.py
+++ b/sources/pyside2/tests/QtWidgets/qmainwindow_test.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2 import QtWidgets
 from PySide2 import QtCore
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MainWindow(QtWidgets.QMainWindow):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtWidgets/qmenu_test.py b/sources/pyside2/tests/QtWidgets/qmenu_test.py
index 9cd2fc9e8..c1d03393c 100644
--- a/sources/pyside2/tests/QtWidgets/qmenu_test.py
+++ b/sources/pyside2/tests/QtWidgets/qmenu_test.py
@@ -36,7 +36,7 @@ from PySide2.QtWidgets import QMenu
 from PySide2.QtGui import QKeySequence, QIcon
 from PySide2.QtCore import SLOT
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QMenuAddAction(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qmenuadd_test.py b/sources/pyside2/tests/QtWidgets/qmenuadd_test.py
index 1be14d796..c2881b206 100644
--- a/sources/pyside2/tests/QtWidgets/qmenuadd_test.py
+++ b/sources/pyside2/tests/QtWidgets/qmenuadd_test.py
@@ -38,7 +38,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2 import QtWidgets
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QMenuAddAction(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qobject_mi_test.py b/sources/pyside2/tests/QtWidgets/qobject_mi_test.py
index be95cab85..032229e4e 100644
--- a/sources/pyside2/tests/QtWidgets/qobject_mi_test.py
+++ b/sources/pyside2/tests/QtWidgets/qobject_mi_test.py
@@ -40,7 +40,7 @@ from PySide2.QtCore import QObject
 from PySide2.QtGui import *
 from PySide2.QtWidgets import *
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class WidgetValidator(QWidget, QIntValidator):
     def __init__(self, parent=None):
diff --git a/sources/pyside2/tests/QtWidgets/qpen_test.py b/sources/pyside2/tests/QtWidgets/qpen_test.py
index fdcdc60ca..9469cb10c 100644
--- a/sources/pyside2/tests/QtWidgets/qpen_test.py
+++ b/sources/pyside2/tests/QtWidgets/qpen_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import Qt, QTimer
 from PySide2.QtGui import QPen, QPainter
diff --git a/sources/pyside2/tests/QtWidgets/qpicture_test.py b/sources/pyside2/tests/QtWidgets/qpicture_test.py
index 3a2a5439b..002be64e5 100644
--- a/sources/pyside2/tests/QtWidgets/qpicture_test.py
+++ b/sources/pyside2/tests/QtWidgets/qpicture_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtCore import QTimer
 from PySide2.QtGui import QPicture, QPainter
 from PySide2.QtWidgets import QWidget
diff --git a/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py b/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py
index 32eea87c9..7e44e92b1 100644
--- a/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py
+++ b/sources/pyside2/tests/QtWidgets/qpixmap_constructor.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QLabel
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 xpm = [
     "27 22 206 2",
diff --git a/sources/pyside2/tests/QtWidgets/qpushbutton_test.py b/sources/pyside2/tests/QtWidgets/qpushbutton_test.py
index 632312df9..7fb17d922 100644
--- a/sources/pyside2/tests/QtWidgets/qpushbutton_test.py
+++ b/sources/pyside2/tests/QtWidgets/qpushbutton_test.py
@@ -32,7 +32,7 @@ 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.usesqapplication 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 b42747f66..2c792a63f 100644
--- a/sources/pyside2/tests/QtWidgets/qsplitter_test.py
+++ b/sources/pyside2/tests/QtWidgets/qsplitter_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtWidgets import QSplitter
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QSplitterTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
index cef918156..5b41af467 100644
--- a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
@@ -36,7 +36,7 @@ from PySide2.QtGui import QStandardItemModel, QStandardItem
 from PySide2.QtWidgets import QWidget
 import shiboken2 as shiboken
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 class QStandardItemModelTest(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py b/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
index 6a83c5c46..80eba412c 100644
--- a/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
@@ -38,7 +38,7 @@ 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 helper.usesqapplication import UsesQApplication
 
 from PySide2.QtGui import QKeySequence
 from PySide2.QtWidgets import QAction
diff --git a/sources/pyside2/tests/QtWidgets/qstyle_test.py b/sources/pyside2/tests/QtWidgets/qstyle_test.py
index 5b29c824f..0452ca0fa 100644
--- a/sources/pyside2/tests/QtWidgets/qstyle_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstyle_test.py
@@ -33,7 +33,7 @@ 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.usesqapplication import UsesQApplication
 
 from PySide2.QtGui import QWindow
 from PySide2.QtWidgets import (QApplication, QFontComboBox, QLabel, QProxyStyle,
diff --git a/sources/pyside2/tests/QtWidgets/qtableview_test.py b/sources/pyside2/tests/QtWidgets/qtableview_test.py
index a9a0f3260..e97c5567c 100644
--- a/sources/pyside2/tests/QtWidgets/qtableview_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtableview_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QAbstractTableModel
 from PySide2.QtWidgets import QTableWidget
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QPenTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qtabwidget_test.py b/sources/pyside2/tests/QtWidgets/qtabwidget_test.py
index 69700d451..5b2ebbdea 100644
--- a/sources/pyside2/tests/QtWidgets/qtabwidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtabwidget_test.py
@@ -33,7 +33,7 @@ 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
+from helper.timedqapplication import TimedQApplication
 
 def makeBug643(tab):
     button = QPushButton('Foo')
diff --git a/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
index 65d7517a6..75e0e4dab 100644
--- a/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtabwidgetclear_test.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class TabWidgetClear(QMainWindow):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py b/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py
index c3cc154bb..aa10fb9d0 100644
--- a/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtextedit_signal_test.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 
 class MyWindow(QtWidgets.QMainWindow):
diff --git a/sources/pyside2/tests/QtWidgets/qtextedit_test.py b/sources/pyside2/tests/QtWidgets/qtextedit_test.py
index ddf0706a3..d809ebfc6 100644
--- a/sources/pyside2/tests/QtWidgets/qtextedit_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtextedit_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtWidgets import QTextEdit
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class DontTouchReference(UsesQApplication):
     '''Check if the QTextTable returned by QTextCursor.insertTable() is not
diff --git a/sources/pyside2/tests/QtWidgets/qtoolbar_test.py b/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
index ab6351e24..956c72ee3 100644
--- a/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtWidgets import QToolBar, QMainWindow, QAction
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class AddActionText(UsesQApplication):
     '''Test case for calling QToolbar.addAction passing a text'''
diff --git a/sources/pyside2/tests/QtWidgets/qtoolbox_test.py b/sources/pyside2/tests/QtWidgets/qtoolbox_test.py
index 04509a59a..e9cf086a6 100644
--- a/sources/pyside2/tests/QtWidgets/qtoolbox_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtoolbox_test.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtGui import QIcon
 from PySide2.QtWidgets import QToolBox, QWidget
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class OwnershipControl(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qtreeview_test.py b/sources/pyside2/tests/QtWidgets/qtreeview_test.py
index 4434895f8..6673d36b9 100644
--- a/sources/pyside2/tests/QtWidgets/qtreeview_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtreeview_test.py
@@ -36,7 +36,7 @@ from PySide2.QtGui import QStandardItemModel
 from PySide2.QtWidgets import (QWidget, QTreeView, QVBoxLayout,
     QStyledItemDelegate, QHeaderView)
 from PySide2.QtCore import Qt
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Widget(QWidget):
     def __init__(self, parent=None):
diff --git a/sources/pyside2/tests/QtWidgets/qtreewidget_test.py b/sources/pyside2/tests/QtWidgets/qtreewidget_test.py
index 8dbecefe2..ec3724f6c 100644
--- a/sources/pyside2/tests/QtWidgets/qtreewidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtreewidget_test.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class QTreeWidgetTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qvariant_test.py b/sources/pyside2/tests/QtWidgets/qvariant_test.py
index 1e9d3d719..8a9bf152f 100644
--- a/sources/pyside2/tests/QtWidgets/qvariant_test.py
+++ b/sources/pyside2/tests/QtWidgets/qvariant_test.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtWidgets import (QApplication, QComboBox, QGraphicsScene,
     QGraphicsRectItem)
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MyDiagram(QGraphicsScene):
     pass
diff --git a/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py b/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py
index b3f5460ac..f06ebb74f 100644
--- a/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py
+++ b/sources/pyside2/tests/QtWidgets/qwidget_setlayout_test.py
@@ -35,7 +35,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class QWidgetTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/QtWidgets/qwidget_test.py b/sources/pyside2/tests/QtWidgets/qwidget_test.py
index b7e307df9..ed6a0226e 100644
--- a/sources/pyside2/tests/QtWidgets/qwidget_test.py
+++ b/sources/pyside2/tests/QtWidgets/qwidget_test.py
@@ -34,7 +34,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class QWidgetInherit(QMainWindow):
     def __init__(self):
diff --git a/sources/pyside2/tests/QtWidgets/reference_count_test.py b/sources/pyside2/tests/QtWidgets/reference_count_test.py
index 188ceba09..7b5412353 100644
--- a/sources/pyside2/tests/QtWidgets/reference_count_test.py
+++ b/sources/pyside2/tests/QtWidgets/reference_count_test.py
@@ -40,7 +40,7 @@ from PySide2.QtCore import Qt, QPointF
 from PySide2.QtGui import QPolygonF
 from PySide2.QtWidgets import QApplication, QGraphicsScene, QGraphicsRectItem, QGraphicsPolygonItem, QGraphicsRectItem
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 destroyedRect = False
 destroyedPol = False
diff --git a/sources/pyside2/tests/QtWidgets/standardpixmap_test.py b/sources/pyside2/tests/QtWidgets/standardpixmap_test.py
index 21bc4cebe..c907c8209 100644
--- a/sources/pyside2/tests/QtWidgets/standardpixmap_test.py
+++ b/sources/pyside2/tests/QtWidgets/standardpixmap_test.py
@@ -35,7 +35,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QStyle
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class StandardPixmapTest(UsesQApplication):
     def testDefaultOptions(self): # Bug 253
diff --git a/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py b/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py
index 6c8336513..56580fc1e 100644
--- a/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py
+++ b/sources/pyside2/tests/QtWidgets/virtual_protected_inheritance_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QTimerEvent
 from PySide2.QtWidgets import QApplication, QSpinBox
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class MySpinButton(QSpinBox):
     '''Simple example class of overriding QObject.timerEvent'''
diff --git a/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py b/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py
index 7695cf700..4ee56152e 100644
--- a/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py
+++ b/sources/pyside2/tests/QtWidgets/virtual_pure_override_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtWidgets import QGraphicsScene, QGraphicsRectItem, QGraphicsView, QApplication
 from PySide2.QtGui import QBrush, QColor
 from PySide2.QtCore import QTimer
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 qgraphics_item_painted = False
 
diff --git a/sources/pyside2/tests/QtWidgets/wrong_return_test.py b/sources/pyside2/tests/QtWidgets/wrong_return_test.py
index 7a89520f8..8fad3d627 100644
--- a/sources/pyside2/tests/QtWidgets/wrong_return_test.py
+++ b/sources/pyside2/tests/QtWidgets/wrong_return_test.py
@@ -37,7 +37,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 import py3kcompat as py3k
 from PySide2 import QtWidgets
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 warnings.simplefilter('error')
diff --git a/sources/pyside2/tests/QtXmlPatterns/import_test.py b/sources/pyside2/tests/QtXmlPatterns/import_test.py
index c35a020d6..0c6f74184 100644
--- a/sources/pyside2/tests/QtXmlPatterns/import_test.py
+++ b/sources/pyside2/tests/QtXmlPatterns/import_test.py
@@ -36,7 +36,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import *
 from PySide2.QtXmlPatterns import QXmlSchema
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 import py3kcompat as py3k
 
 class QXmlPatternsTest(UsesQCoreApplication):
diff --git a/sources/pyside2/tests/mac/qmacstyle_test.py b/sources/pyside2/tests/mac/qmacstyle_test.py
index 90f7bf032..4a65a144d 100644
--- a/sources/pyside2/tests/mac/qmacstyle_test.py
+++ b/sources/pyside2/tests/mac/qmacstyle_test.py
@@ -36,7 +36,7 @@ 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.usesqapplication import UsesQApplication
 
 class QMacStyleTest(UsesQApplication):
     def setUp(self):
diff --git a/sources/pyside2/tests/pysidetest/constructor_properties_test.py b/sources/pyside2/tests/pysidetest/constructor_properties_test.py
index cb2e02773..e84a4546e 100644
--- a/sources/pyside2/tests/pysidetest/constructor_properties_test.py
+++ b/sources/pyside2/tests/pysidetest/constructor_properties_test.py
@@ -43,7 +43,7 @@ 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.usesqapplication import UsesQApplication
 from PySide2.QtCore import Qt
 from PySide2.QtWidgets import QApplication, QLabel, QFrame
 
diff --git a/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py b/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
index 1d5a59178..82967a177 100644
--- a/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
+++ b/sources/pyside2/tests/pysidetest/delegatecreateseditor_test.py
@@ -29,7 +29,7 @@
 #############################################################################
 
 import unittest
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 from testbinding import TestView
 from PySide2.QtCore import Qt
diff --git a/sources/pyside2/tests/pysidetest/qvariant_test.py b/sources/pyside2/tests/pysidetest/qvariant_test.py
index ec8343a12..8f8b8b968 100644
--- a/sources/pyside2/tests/pysidetest/qvariant_test.py
+++ b/sources/pyside2/tests/pysidetest/qvariant_test.py
@@ -32,7 +32,7 @@ from testbinding import TestObject
 from PySide2.QtCore import Qt
 from PySide2.QtGui import QKeySequence
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class QVariantTest(UsesQApplication):
 
diff --git a/sources/pyside2/tests/signals/bug_189.py b/sources/pyside2/tests/signals/bug_189.py
index 113cb2485..a23658422 100644
--- a/sources/pyside2/tests/signals/bug_189.py
+++ b/sources/pyside2/tests/signals/bug_189.py
@@ -33,7 +33,7 @@ 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
+from helper.usesqapplication import UsesQApplication
 
 class TestBugPYSIDE189(UsesQApplication):
 
diff --git a/sources/pyside2/tests/signals/bug_311.py b/sources/pyside2/tests/signals/bug_311.py
index 9f5e84dbf..36e022a55 100644
--- a/sources/pyside2/tests/signals/bug_311.py
+++ b/sources/pyside2/tests/signals/bug_311.py
@@ -36,7 +36,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class DerivedDate(QtCore.QDate):
     def __init__(self,y,m,d):
diff --git a/sources/pyside2/tests/signals/bug_319.py b/sources/pyside2/tests/signals/bug_319.py
index 7e8728e7a..f42add3cf 100644
--- a/sources/pyside2/tests/signals/bug_319.py
+++ b/sources/pyside2/tests/signals/bug_319.py
@@ -36,7 +36,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class Listener(QtCore.QObject):
     def __init__(self):
diff --git a/sources/pyside2/tests/signals/lambda_gui_test.py b/sources/pyside2/tests/signals/lambda_gui_test.py
index 0a0db9514..4f33addab 100644
--- a/sources/pyside2/tests/signals/lambda_gui_test.py
+++ b/sources/pyside2/tests/signals/lambda_gui_test.py
@@ -42,7 +42,7 @@ try:
 except ImportError:
     hasQtGui = False
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 if hasQtGui:
     class Control:
diff --git a/sources/pyside2/tests/signals/lambda_test.py b/sources/pyside2/tests/signals/lambda_test.py
index 97d0c90fc..2a3f0139a 100644
--- a/sources/pyside2/tests/signals/lambda_test.py
+++ b/sources/pyside2/tests/signals/lambda_test.py
@@ -38,7 +38,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QObject, SIGNAL, QProcess
 
-from helper import UsesQCoreApplication
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 
 class Dummy(QObject):
diff --git a/sources/pyside2/tests/signals/multiple_connections_gui_test.py b/sources/pyside2/tests/signals/multiple_connections_gui_test.py
index 45dbb6c94..d4104b5ce 100644
--- a/sources/pyside2/tests/signals/multiple_connections_gui_test.py
+++ b/sources/pyside2/tests/signals/multiple_connections_gui_test.py
@@ -42,7 +42,8 @@ try:
 except ImportError:
     hasQtGui = False
 
-from helper import BasicPySlotCase, UsesQApplication
+from helper.basicpyslotcase import BasicPySlotCase
+from helper.usesqapplication import UsesQApplication
 
 class MultipleSignalConnections(unittest.TestCase):
     '''Base class for multiple signal connection testing'''
diff --git a/sources/pyside2/tests/signals/multiple_connections_test.py b/sources/pyside2/tests/signals/multiple_connections_test.py
index 9c7e7c9da..8172596b1 100644
--- a/sources/pyside2/tests/signals/multiple_connections_test.py
+++ b/sources/pyside2/tests/signals/multiple_connections_test.py
@@ -35,7 +35,8 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QObject, SIGNAL, QProcess
 
-from helper import BasicPySlotCase, UsesQCoreApplication
+from helper.basicpyslotcase import BasicPySlotCase
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 
 class MultipleSignalConnections(unittest.TestCase):
diff --git a/sources/pyside2/tests/signals/pysignal_test.py b/sources/pyside2/tests/signals/pysignal_test.py
index 51d4f8368..bdb62b5bf 100644
--- a/sources/pyside2/tests/signals/pysignal_test.py
+++ b/sources/pyside2/tests/signals/pysignal_test.py
@@ -40,7 +40,7 @@ try:
 except ImportError:
     hasQtGui = False
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 class Dummy(QObject):
     """Dummy class used in this test."""
diff --git a/sources/pyside2/tests/signals/qobject_sender_test.py b/sources/pyside2/tests/signals/qobject_sender_test.py
index 7aa98ced8..108054518 100644
--- a/sources/pyside2/tests/signals/qobject_sender_test.py
+++ b/sources/pyside2/tests/signals/qobject_sender_test.py
@@ -38,7 +38,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class ExtQTimer(QTimer):
     def __init__(self):
diff --git a/sources/pyside2/tests/signals/ref02_test.py b/sources/pyside2/tests/signals/ref02_test.py
index ddd82e3c4..e7659246d 100644
--- a/sources/pyside2/tests/signals/ref02_test.py
+++ b/sources/pyside2/tests/signals/ref02_test.py
@@ -36,7 +36,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class NativeSignalsTest(UsesQCoreApplication):
 
diff --git a/sources/pyside2/tests/signals/ref05_test.py b/sources/pyside2/tests/signals/ref05_test.py
index 173027a88..848bf89d6 100644
--- a/sources/pyside2/tests/signals/ref05_test.py
+++ b/sources/pyside2/tests/signals/ref05_test.py
@@ -36,7 +36,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class ExtQObject(QObject):
 
diff --git a/sources/pyside2/tests/signals/ref06_test.py b/sources/pyside2/tests/signals/ref06_test.py
index 689dd8113..adba267b4 100644
--- a/sources/pyside2/tests/signals/ref06_test.py
+++ b/sources/pyside2/tests/signals/ref06_test.py
@@ -36,7 +36,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class ExtQObject(QObject):
     signalbetween = Signal('qreal')
diff --git a/sources/pyside2/tests/signals/self_connect_test.py b/sources/pyside2/tests/signals/self_connect_test.py
index 8620c10d6..61280474a 100644
--- a/sources/pyside2/tests/signals/self_connect_test.py
+++ b/sources/pyside2/tests/signals/self_connect_test.py
@@ -39,7 +39,7 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 from PySide2.QtCore import QObject, SIGNAL, SLOT
 from PySide2.QtWidgets import QPushButton, QWidget
 
-from helper import UsesQApplication
+from helper.usesqapplication import UsesQApplication
 
 
 class SelfConnect(UsesQApplication):
diff --git a/sources/pyside2/tests/signals/signal_emission_gui_test.py b/sources/pyside2/tests/signals/signal_emission_gui_test.py
index 0a6255f8a..4b36336fb 100644
--- a/sources/pyside2/tests/signals/signal_emission_gui_test.py
+++ b/sources/pyside2/tests/signals/signal_emission_gui_test.py
@@ -44,7 +44,8 @@ try:
 except ImportError:
     hasQtGui = False
 
-from helper import BasicPySlotCase, UsesQApplication
+from helper.basicpyslotcase import BasicPySlotCase
+from helper.usesqapplication import UsesQApplication
 
 if hasQtGui:
     class ButtonPySlot(UsesQApplication, BasicPySlotCase):
diff --git a/sources/pyside2/tests/signals/signal_emission_test.py b/sources/pyside2/tests/signals/signal_emission_test.py
index 844bccc21..e45902abd 100644
--- a/sources/pyside2/tests/signals/signal_emission_test.py
+++ b/sources/pyside2/tests/signals/signal_emission_test.py
@@ -39,7 +39,8 @@ sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__f
 
 from PySide2.QtCore import QObject, SIGNAL, SLOT, QProcess, QTimeLine
 
-from helper import BasicPySlotCase, UsesQCoreApplication
+from helper.basicpyslotcase import BasicPySlotCase
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 
 class ArgsOnEmptySignal(UsesQCoreApplication):
diff --git a/sources/pyside2/tests/signals/signal_object_test.py b/sources/pyside2/tests/signals/signal_object_test.py
index 75115b37c..76b859a4f 100644
--- a/sources/pyside2/tests/signals/signal_object_test.py
+++ b/sources/pyside2/tests/signals/signal_object_test.py
@@ -35,7 +35,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class MyObject(QTimer):
     sig1 = Signal()
diff --git a/sources/pyside2/tests/signals/signal_signature_test.py b/sources/pyside2/tests/signals/signal_signature_test.py
index 0cce9c2f1..da19862fe 100644
--- a/sources/pyside2/tests/signals/signal_signature_test.py
+++ b/sources/pyside2/tests/signals/signal_signature_test.py
@@ -37,7 +37,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 called = False
 name = "Old"
diff --git a/sources/pyside2/tests/signals/static_metaobject_test.py b/sources/pyside2/tests/signals/static_metaobject_test.py
index 2b76e6874..a6cca5ca4 100644
--- a/sources/pyside2/tests/signals/static_metaobject_test.py
+++ b/sources/pyside2/tests/signals/static_metaobject_test.py
@@ -37,7 +37,7 @@ 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
+from helper.usesqcoreapplication import UsesQCoreApplication
 
 class MyObject(QObject):
     def __init__(self, parent=None):
diff --git a/sources/pyside2/tests/util/helper/__init__.py b/sources/pyside2/tests/util/helper/__init__.py
index 084b3e710..218d8921e 100644
--- a/sources/pyside2/tests/util/helper/__init__.py
+++ b/sources/pyside2/tests/util/helper/__init__.py
@@ -1,171 +1 @@
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-'''Helper classes and functions'''
-
-import os
-import unittest
-
-from random import randint
-
-from PySide2.QtCore import QCoreApplication, QTimer
-
-try:
-    from PySide2.QtGui import QGuiApplication
-except ImportError:
-    has_gui = False
-else:
-    has_gui = True
-
-try:
-    from PySide2.QtWidgets import QApplication
-except ImportError:
-    has_widgets = False
-else:
-    has_widgets = True
-
-def adjust_filename(filename, orig_mod_filename):
-    dirpath = os.path.dirname(os.path.abspath(orig_mod_filename))
-    return os.path.join(dirpath, filename)
-
-class NoQtGuiError(Exception):
-    def __init__(self):
-        Exception.__init__(self, 'No QtGui found')
-
-class BasicPySlotCase(object):
-    '''Base class that tests python slots and signal emissions.
-
-    Python slots are defined as any callable passed to QObject.connect().
-    '''
-    def setUp(self):
-        self.called = False
-
-    def tearDown(self):
-        try:
-            del self.args
-        except:
-            pass
-
-    def cb(self, *args):
-        '''Simple callback with arbitrary arguments.
-
-        The test function must setup the 'args' attribute with a sequence
-        containing the arguments expected to be received by this slot.
-        Currently only a single connection is supported.
-        '''
-        if tuple(self.args) == args:
-            self.called = True
-        else:
-            raise ValueError('Invalid arguments for callback')
-
-if has_gui:
-    class UsesQGuiApplication(unittest.TestCase):
-        '''Helper class to provide QGuiApplication instances'''
-
-        def setUp(self):
-            '''Creates the QGuiApplication instance'''
-
-            # Simple way of making instance a singleton
-            super(UsesQGuiApplication, self).setUp()
-            self.app = QGuiApplication.instance() or QGuiApplication([])
-
-        def tearDown(self):
-            '''Deletes the reference owned by self'''
-            del self.app
-            super(UsesQGuiApplication, self).tearDown()
-
-if has_widgets:
-    class UsesQApplication(unittest.TestCase):
-        '''Helper class to provide QApplication instances'''
-
-        qapplication = True
-
-        def setUp(self):
-            '''Creates the QApplication instance'''
-
-            # Simple way of making instance a singleton
-            super(UsesQApplication, self).setUp()
-            self.app = QApplication.instance() or QApplication([])
-
-        def tearDown(self):
-            '''Deletes the reference owned by self'''
-            del self.app
-            super(UsesQApplication, self).tearDown()
-
-
-    class TimedQApplication(unittest.TestCase):
-        '''Helper class with timed QApplication exec loop'''
-
-        def setUp(self, timeout=100):
-            '''Setups this Application.
-
-            timeout - timeout in milisseconds'''
-            self.app = QApplication.instance() or QApplication([])
-            QTimer.singleShot(timeout, self.app.quit)
-
-        def tearDown(self):
-            '''Delete resources'''
-            del self.app
-else:
-    class UsesQApplication(unittest.TestCase):
-        def setUp(self):
-            raise NoQtGuiError()
-    class TimedQapplication(unittest.TestCase):
-        def setUp(self):
-            raise NoQtGuiError()
-
-
-_core_instance = None
-
-class UsesQCoreApplication(unittest.TestCase):
-    '''Helper class for test cases that require an QCoreApplication
-    Just connect or call self.exit_app_cb. When called, will ask
-    self.app to exit.
-    '''
-
-    def setUp(self):
-        '''Set up resources'''
-
-        global _core_instance
-        if _core_instance is None:
-            _core_instance = QCoreApplication([])
-
-        self.app = _core_instance
-
-    def tearDown(self):
-        '''Release resources'''
-        del self.app
-
-    def exit_app_cb(self):
-        '''Quits the application'''
-        self.app.exit(0)
-
-
-def random_string(size=5):
-    '''Generate random string with the given size'''
-    return ''.join(map(chr, [randint(33, 126) for x in range(size)]))
+# This file intentionally left blank.
diff --git a/sources/pyside2/tests/util/helper/basicpyslotcase.py b/sources/pyside2/tests/util/helper/basicpyslotcase.py
new file mode 100644
index 000000000..511db8e08
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/basicpyslotcase.py
@@ -0,0 +1,54 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+class BasicPySlotCase(object):
+    '''Base class that tests python slots and signal emissions.
+
+    Python slots are defined as any callable passed to QObject.connect().
+    '''
+    def setUp(self):
+        self.called = False
+
+    def tearDown(self):
+        try:
+            del self.args
+        except:
+            pass
+
+    def cb(self, *args):
+        '''Simple callback with arbitrary arguments.
+
+        The test function must setup the 'args' attribute with a sequence
+        containing the arguments expected to be received by this slot.
+        Currently only a single connection is supported.
+        '''
+        if tuple(self.args) == args:
+            self.called = True
+        else:
+            raise ValueError('Invalid arguments for callback')
diff --git a/sources/pyside2/tests/util/helper/helper.py b/sources/pyside2/tests/util/helper/helper.py
new file mode 100644
index 000000000..f03a4e90c
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/helper.py
@@ -0,0 +1,42 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Helper classes and functions'''
+
+import os
+from random import randint
+
+
+def adjust_filename(filename, orig_mod_filename):
+    dirpath = os.path.dirname(os.path.abspath(orig_mod_filename))
+    return os.path.join(dirpath, filename)
+
+
+def random_string(size=5):
+    '''Generate random string with the given size'''
+    return ''.join(map(chr, [randint(33, 126) for x in range(size)]))
diff --git a/sources/pyside2/tests/util/helper/helper.pyproject b/sources/pyside2/tests/util/helper/helper.pyproject
new file mode 100644
index 000000000..dc23d87a5
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/helper.pyproject
@@ -0,0 +1,5 @@
+{
+    "files": ["basicpyslotcase.py", "docmodifier.py", "helper.py",
+    "timedqapplication.py", "usesqapplication.py", "usesqcoreapplication.py",
+    "usesqguiapplication.py" ]
+}
diff --git a/sources/pyside2/tests/util/helper/timedqapplication.py b/sources/pyside2/tests/util/helper/timedqapplication.py
new file mode 100644
index 000000000..4ee9bdc3a
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/timedqapplication.py
@@ -0,0 +1,49 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Helper classes and functions'''
+
+import unittest
+
+from PySide2.QtCore import QTimer
+from PySide2.QtWidgets import QApplication
+
+
+class TimedQApplication(unittest.TestCase):
+    '''Helper class with timed QApplication exec loop'''
+
+    def setUp(self, timeout=100):
+        '''Setups this Application.
+
+        timeout - timeout in milisseconds'''
+        self.app = QApplication.instance() or QApplication([])
+        QTimer.singleShot(timeout, self.app.quit)
+
+    def tearDown(self):
+        '''Delete resources'''
+        del self.app
diff --git a/sources/pyside2/tests/util/helper/usesqapplication.py b/sources/pyside2/tests/util/helper/usesqapplication.py
new file mode 100644
index 000000000..1c47d0dfb
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/usesqapplication.py
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Helper classes and functions'''
+
+import unittest
+
+from PySide2.QtWidgets import QApplication
+
+
+class UsesQApplication(unittest.TestCase):
+    '''Helper class to provide QApplication instances'''
+
+    qapplication = True
+
+    def setUp(self):
+        '''Creates the QApplication instance'''
+
+        # Simple way of making instance a singleton
+        super(UsesQApplication, self).setUp()
+        self.app = QApplication.instance() or QApplication([])
+
+    def tearDown(self):
+        '''Deletes the reference owned by self'''
+        del self.app
+        super(UsesQApplication, self).tearDown()
diff --git a/sources/pyside2/tests/util/helper/usesqcoreapplication.py b/sources/pyside2/tests/util/helper/usesqcoreapplication.py
new file mode 100644
index 000000000..aab8f4b25
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/usesqcoreapplication.py
@@ -0,0 +1,59 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Helper classes and functions'''
+
+import unittest
+
+from PySide2.QtCore import QCoreApplication
+
+_core_instance = None
+
+
+class UsesQCoreApplication(unittest.TestCase):
+    '''Helper class for test cases that require an QCoreApplication
+    Just connect or call self.exit_app_cb. When called, will ask
+    self.app to exit.
+    '''
+
+    def setUp(self):
+        '''Set up resources'''
+
+        global _core_instance
+        if _core_instance is None:
+            _core_instance = QCoreApplication([])
+
+        self.app = _core_instance
+
+    def tearDown(self):
+        '''Release resources'''
+        del self.app
+
+    def exit_app_cb(self):
+        '''Quits the application'''
+        self.app.exit(0)
diff --git a/sources/pyside2/tests/util/helper/usesqguiapplication.py b/sources/pyside2/tests/util/helper/usesqguiapplication.py
new file mode 100644
index 000000000..c6124d5dd
--- /dev/null
+++ b/sources/pyside2/tests/util/helper/usesqguiapplication.py
@@ -0,0 +1,49 @@
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Helper classes and functions'''
+
+import unittest
+
+from PySide2.QtGui import QGuiApplication
+
+
+class UsesQGuiApplication(unittest.TestCase):
+    '''Helper class to provide QGuiApplication instances'''
+
+    def setUp(self):
+        '''Creates the QGuiApplication instance'''
+
+        # Simple way of making instance a singleton
+        super(UsesQGuiApplication, self).setUp()
+        self.app = QGuiApplication.instance() or QGuiApplication([])
+
+    def tearDown(self):
+        '''Deletes the reference owned by self'''
+        del self.app
+        super(UsesQGuiApplication, self).tearDown()
author	Friedemann Kleint <Friedemann.Kleint@qt.io>	2020-02-19 09:51:25 +0100
committer	Friedemann Kleint <Friedemann.Kleint@qt.io>	2020-02-20 22:16:57 +0100
commit	f69d163d17d3717c28f2c065173113756d7c50ef (patch)
tree	f8203180c87c919b228fed4f70d2a3a23b81246d
parent	bc4d618d5f4c82c9a826a195043739c7e63ed138 (diff)