diff --git a/selftests/all/functional/avocado/sysinfo_tests.py b/selftests/all/functional/avocado/sysinfo_tests.py
index 970f13b5a362301b6cca033d934c7aad10e978b9..c1368fe9a48b3005696e955e97e85c4c8aaa28f7 100644
--- a/selftests/all/functional/avocado/sysinfo_tests.py
+++ b/selftests/all/functional/avocado/sysinfo_tests.py
@@ -40,8 +40,8 @@ class SysInfoTest(unittest.TestCase):
         self.assertGreater(len(os.listdir(sysinfo_dir)), 0, msg)
         for hook in ('pre', 'post'):
             sysinfo_subdir = os.path.join(sysinfo_dir, hook)
-            msg = 'The sysinfo/%s subdirectory is empty:\n%s' % (hook, result)
-            self.assertGreater(len(os.listdir(sysinfo_subdir)), 0, msg)
+            msg = 'The sysinfo/%s subdirectory does not exist:\n%s' % (hook, result)
+            self.assertTrue(os.path.exists(sysinfo_subdir), msg)
 
     def test_sysinfo_disabled(self):
         os.chdir(basedir)
diff --git a/selftests/all/unit/avocado/sysinfo_unittest.py b/selftests/all/unit/avocado/sysinfo_unittest.py
index 6e413e53a6830b0f17d832f9234d106fadf439f7..ab5e82b7d360f311d4aabc0a25fee72b9c72e198 100644
--- a/selftests/all/unit/avocado/sysinfo_unittest.py
+++ b/selftests/all/unit/avocado/sysinfo_unittest.py
@@ -69,13 +69,9 @@ class SysinfoTest(unittest.TestCase):
                                 "Job does not have 'pre' dir")
         job_predir = os.path.join(jobdir, 'pre')
         self.assertTrue(os.path.isdir(job_predir))
-        self.assertGreater(len(os.listdir(job_predir)), 0,
-                           "Job pre dir is empty")
         sysinfo_logger.end_job_hook()
         job_postdir = os.path.join(jobdir, 'post')
         self.assertTrue(os.path.isdir(job_postdir))
-        self.assertGreater(len(os.listdir(job_postdir)), 0,
-                           "Job post dir is empty")
 
     def test_logger_test_hooks(self):
         testdir = os.path.join(self.tmpdir, 'job', 'test1')