2 files changed, 3 insertions, 3 deletions

diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index 00cf24e735..5398b3c767 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -163,7 +163,6 @@ def exportTests(d,tc):
 def testexport_main(d):
     from oeqa.oetest import ExportTestContext
     from oeqa.targetcontrol import get_target_controller
-    from oeqa.utils.dump import get_host_dumper
 
     test_create_extract_dirs(d)
     export_dir = d.getVar("TEST_EXPORT_DIR")
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 6fed408613..62ecaef502 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -128,8 +128,8 @@ def testimage_main(d):
     import signal
     from oeqa.oetest import ImageTestContext
     from oeqa.targetcontrol import get_target_controller
-    from oeqa.utils.dump import get_host_dumper
     from bb.utils import export_proxies
+    from oeqa.utils.dump import HostDumper
 
     pn = d.getVar("PN")
     bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR"))
@@ -139,7 +139,8 @@ def testimage_main(d):
     export_proxies(d)
 
     # we need the host dumper in test context
-    host_dumper = get_host_dumper(d)
+    host_dumper = HostDumper(d.getVar("testimage_dump_host", True),
+        d.getVar("TESTIMAGE_DUMP_DIR", True))
 
     # the robot dance
     target = get_target_controller(d)