diff --git a/qa/tasks/cephfs/caps_helper.py b/qa/tasks/cephfs/caps_helper.py
index f3bc14b074205e..76d61e843a5204 100644
--- a/qa/tasks/cephfs/caps_helper.py
+++ b/qa/tasks/cephfs/caps_helper.py
@@ -3,7 +3,7 @@
 """
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
 
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 
 class CapsHelper(CephFSTestCase):
 
diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index bdfef282ebc785..1a8a99e8b36049 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -14,7 +14,7 @@
 from teuthology.contextutil import safe_while
 from teuthology.misc import get_file, write_file
 from teuthology.orchestra import run
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 from teuthology.exceptions import CommandFailedError, ConnectionLostError
 
 from tasks.cephfs.filesystem import Filesystem
diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py
index d7a083d72ec1f2..eef4ef3252c031 100644
--- a/qa/tasks/cephfs/test_admin.py
+++ b/qa/tasks/cephfs/test_admin.py
@@ -6,7 +6,7 @@
 from io import StringIO
 from os.path import join as os_path_join
 
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 from teuthology.exceptions import CommandFailedError
 
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
diff --git a/qa/tasks/cephfs/test_snapshots.py b/qa/tasks/cephfs/test_snapshots.py
index bc3e6a16c8a5a7..a324764c8c4c56 100644
--- a/qa/tasks/cephfs/test_snapshots.py
+++ b/qa/tasks/cephfs/test_snapshots.py
@@ -4,7 +4,7 @@
 from textwrap import dedent
 from tasks.cephfs.fuse_mount import FuseMount
 from tasks.cephfs.cephfs_test_case import CephFSTestCase
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 from teuthology.exceptions import CommandFailedError
 
 log = logging.getLogger(__name__)
diff --git a/qa/tasks/cephfs/test_strays.py b/qa/tasks/cephfs/test_strays.py
index 6e96ee4d529e38..200ef5a4fa0fde 100644
--- a/qa/tasks/cephfs/test_strays.py
+++ b/qa/tasks/cephfs/test_strays.py
@@ -6,7 +6,7 @@
 import gevent
 
 from teuthology.exceptions import CommandFailedError
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 from tasks.cephfs.cephfs_test_case import CephFSTestCase, for_teuthology
 
 log = logging.getLogger(__name__)
diff --git a/qa/tasks/mds_creation_failure.py b/qa/tasks/mds_creation_failure.py
index 2ab8f70dd9d2fa..766a7c57ea8835 100644
--- a/qa/tasks/mds_creation_failure.py
+++ b/qa/tasks/mds_creation_failure.py
@@ -6,7 +6,7 @@
 from tasks import ceph_manager
 from teuthology import misc
 from teuthology.exceptions import CommandFailedError
-from teuthology.orchestra.run import Raw
+from teuthology.orchestra.run_helper import Raw
 
 log = logging.getLogger(__name__)
 
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 63976fc9d6e380..2a0db952a0a248 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -50,7 +50,7 @@
 
 from unittest import suite, loader
 
-from teuthology.orchestra.run import Raw, quote, PIPE
+from teuthology.orchestra.run_helper import Raw, quote, PIPE
 from teuthology.orchestra.daemon import DaemonGroup
 from teuthology.orchestra.remote import Remote
 from teuthology.config import config as teuth_config