diff --git a/selftests/all/functional/avocado/multiplex_tests.py b/selftests/all/functional/avocado/multiplex_tests.py
index 73aed7b9836b33d5bb65a2357d2df1199249e3c1..84a91ad44e85b07ce6d02ecbe24eb933638347b5 100644
--- a/selftests/all/functional/avocado/multiplex_tests.py
+++ b/selftests/all/functional/avocado/multiplex_tests.py
@@ -60,7 +60,7 @@ class MultiplexTests(unittest.TestCase):
                          "%d:\n%s" % (cmd_line, expected_rc, result))
 
     def test_mplex_plugin(self):
-        cmd_line = './scripts/avocado multiplex tests/sleeptest/sleeptest.mplx'
+        cmd_line = './scripts/avocado multiplex tests/sleeptest.data/sleeptest.mplx'
         expected_rc = 0
         self.run_and_check(cmd_line, expected_rc)
 
@@ -70,7 +70,7 @@ class MultiplexTests(unittest.TestCase):
         self.run_and_check(cmd_line, expected_rc)
 
     def test_run_mplex_sleeptest(self):
-        cmd_line = './scripts/avocado run sleeptest --multiplex tests/sleeptest/sleeptest.mplx'
+        cmd_line = './scripts/avocado run sleeptest --multiplex tests/sleeptest.data/sleeptest.mplx'
         expected_rc = 0
         # A typical sleeptest has about 14 lines of output,
         # so we expect the full job log has at least 3 times
@@ -79,12 +79,12 @@ class MultiplexTests(unittest.TestCase):
         self.run_and_check(cmd_line, expected_rc, 14*3)
 
     def test_run_mplex_doublesleep(self):
-        cmd_line = './scripts/avocado run "sleeptest sleeptest" --multiplex tests/sleeptest/sleeptest.mplx'
+        cmd_line = './scripts/avocado run "sleeptest sleeptest" --multiplex tests/sleeptest.data/sleeptest.mplx'
         expected_rc = 0
         self.run_and_check(cmd_line, expected_rc)
 
     def test_run_mplex_failtest(self):
-        cmd_line = './scripts/avocado run "sleeptest failtest" --multiplex tests/sleeptest/sleeptest.mplx'
+        cmd_line = './scripts/avocado run "sleeptest failtest" --multiplex tests/sleeptest.data/sleeptest.mplx'
         expected_rc = 1
         self.run_and_check(cmd_line, expected_rc)
 
diff --git a/selftests/all/functional/avocado/standalone_tests.py b/selftests/all/functional/avocado/standalone_tests.py
index a6b7c605dd4846f547acd7c8459bd705453e3151..a0efffca52d2fa01b94302657e70ed2232513f2f 100644
--- a/selftests/all/functional/avocado/standalone_tests.py
+++ b/selftests/all/functional/avocado/standalone_tests.py
@@ -44,27 +44,27 @@ class StandaloneTests(unittest.TestCase):
                          "%d:\n%s" % (tstname, expected_rc, result))
 
     def test_sleeptest(self):
-        cmd_line = './tests/sleeptest/sleeptest.py'
+        cmd_line = './tests/sleeptest.py'
         expected_rc = 0
         self.run_and_check(cmd_line, expected_rc, 'sleeptest')
 
     def test_skiptest(self):
-        cmd_line = './tests/skiptest/skiptest.py'
+        cmd_line = './tests/skiptest.py'
         expected_rc = 0
         self.run_and_check(cmd_line, expected_rc, 'skiptest')
 
     def test_failtest(self):
-        cmd_line = './tests/failtest/failtest.py'
+        cmd_line = './tests/failtest.py'
         expected_rc = 1
         self.run_and_check(cmd_line, expected_rc, 'failtest')
 
     def test_errortest(self):
-        cmd_line = './tests/errortest/errortest.py'
+        cmd_line = './tests/errortest.py'
         expected_rc = 1
         self.run_and_check(cmd_line, expected_rc, 'errortest')
 
     def test_warntest(self):
-        cmd_line = './tests/warntest/warntest.py'
+        cmd_line = './tests/warntest.py'
         expected_rc = 1
         self.run_and_check(cmd_line, expected_rc, 'warntest')