diff --git a/src/osmo-gsm-tester.py b/src/osmo-gsm-tester.py
index af66b32..dc1e058 100755
--- a/src/osmo-gsm-tester.py
+++ b/src/osmo-gsm-tester.py
@@ -71,9 +71,10 @@
 from signal import *
 from osmo_gsm_tester import __version__
 from osmo_gsm_tester.core import log
+from osmo_gsm_tester.core import trial
+from osmo_gsm_tester.core import suite
 from osmo_gsm_tester.core.config import read_config_file, DEFAULT_SUITES_CONF
 from osmo_gsm_tester.core.schema import generate_schemas
-from osmo_gsm_tester import trial, suite
 
 def sig_handler_cleanup(signum, frame):
     print("killed by signal %d" % signum)
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/core/suite.py
similarity index 98%
rename from src/osmo_gsm_tester/suite.py
rename to src/osmo_gsm_tester/core/suite.py
index 3416ff5..0995f8f 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/core/suite.py
@@ -21,12 +21,12 @@
 import sys
 import time
 import pprint
-from .core import config
-from .core import log
-from .core import util
-from .core import schema
-from .core import resource
-from .core import test
+from . import config
+from . import log
+from . import util
+from . import schema
+from . import resource
+from . import test
 
 class SuiteDefinition(log.Origin):
     '''A test suite reserves resources for a number of tests.
diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/core/trial.py
similarity index 98%
rename from src/osmo_gsm_tester/trial.py
rename to src/osmo_gsm_tester/core/trial.py
index 08b7d8f..83b0f11 100644
--- a/src/osmo_gsm_tester/trial.py
+++ b/src/osmo_gsm_tester/core/trial.py
@@ -22,10 +22,9 @@
 import shutil
 import tarfile
 
-from .core import log
-from .core import util
-from .core import report
-
+from . import log
+from . import util
+from . import report
 from . import suite
 
 FILE_MARK_TAKEN = 'taken'