diff --git a/selftest/resource_test.py b/selftest/resource_test.py
index ecbeb246..0b9550e6 100755
--- a/selftest/resource_test.py
+++ b/selftest/resource_test.py
@@ -6,9 +6,8 @@ import pprint
 import shutil
 import atexit
 import _prep
-from osmo_gsm_tester.core import config, log, util
+from osmo_gsm_tester.core import config, log, util, resource
 from osmo_gsm_tester.core.schema import generate_schemas
-from osmo_gsm_tester import resource
 
 workdir = util.get_tempdir()
 
diff --git a/src/osmo_gsm_tester/resource.py b/src/osmo_gsm_tester/core/resource.py
similarity index 99%
rename from src/osmo_gsm_tester/resource.py
rename to src/osmo_gsm_tester/core/resource.py
index 7674bff8..a1a8ea57 100644
--- a/src/osmo_gsm_tester/resource.py
+++ b/src/osmo_gsm_tester/core/resource.py
@@ -22,12 +22,12 @@ import copy
 import atexit
 import pprint
 
-from .core import log
-from .core import config
-from .core import util
-from .core import schema
+from . import log
+from . import config
+from . import util
+from . import schema
 
-from .core.util import is_dict, is_list
+from .util import is_dict, is_list
 
 HASH_KEY = '_hash'
 RESERVED_KEY = '_reserved_by'
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index db307ffb..c5421c45 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -21,7 +21,7 @@ import os
 import sys
 import time
 import pprint
-from .core import config, log, util, process, schema
+from .core import config, log, util, process, schema, resource
 from .core.event_loop import MainLoop
 from .obj import nitb_osmo, hlr_osmo, mgcpgw_osmo, mgw_osmo, msc_osmo, bsc_osmo, stp_osmo, ggsn_osmo, sgsn_osmo, esme, osmocon, ms_driver, iperf3
 from .obj import run_node
@@ -29,7 +29,7 @@ from .obj import epc
 from .obj import enb
 from .obj import bts
 from .obj import ms
-from . import resource, test
+from . import test
 
 class Timeout(Exception):
     pass
diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py
index 64b45c5b..ec81d7d5 100644
--- a/src/osmo_gsm_tester/test.py
+++ b/src/osmo_gsm_tester/test.py
@@ -23,8 +23,7 @@ import time
 import traceback
 from . import testenv
 
-from .core import log, util
-from . import resource
+from .core import log, util, resource
 
 class Test(log.Origin):
     UNKNOWN = 'UNKNOWN' # matches junit 'error'