diff --git a/generic/tests/cfg/avocado_guest.cfg b/generic/tests/cfg/avocado_guest.cfg
index d34aa824efce6595b75ba38c8780ed44e2d34319..058cb0de53465d14d5e3c882fc7bdd9bd3fbdf66 100644
--- a/generic/tests/cfg/avocado_guest.cfg
+++ b/generic/tests/cfg/avocado_guest.cfg
@@ -4,10 +4,90 @@
     only Linux
     type = avocado_guest
     test_timeout = 1800
+    avocadomux = ""
     variants:
         - ebizzy:
             avocadotest = "cpu/ebizzy.py"
-            avocadomux = ""
         - ebizzy_stress:
             avocadotest = "cpu/ebizzy.py,perf/stress.py"
             avocadomux = ","
+        - cpustress:
+            avocadotest = "cpu/cpustress.py"
+        - linsched:
+            avocadotest = "cpu/linsched.py"
+        - filebench:
+            avocadotest = "fs/filebench.py"
+        - fsx:
+            avocadotest = "fs/fsx.py"
+        - xfstest:
+            avocadotest = "fs/xfstests.py"
+        - fsfuzzer:
+            avocadotest = "fuzz/fsfuzzer.py"
+        - trinity:
+            avocadotest = "fuzz/trinity.py"
+        - ltp:
+            avocadotest = "generic/ltp.py"
+        - nstress:
+            avocadotest = "generic/nstress.py"
+        - rcutorture:
+            avocadotest = "generic/rcutorture.py"
+        - service_check:
+            avocadotest = "generic/service_check.py"
+        - sosreport:
+            avocadotest = "generic/sosreport.py"
+        - stress-ng:
+            avocadotest = "generic/stress-ng.py"
+        - bonnie:
+            avocadotest = "io/disk/bonnie.py"
+        - dbench:
+            avocadotest = "io/disk/dbench.py"
+        - disktest:
+            avocadotest = "io/disk/disktest.py"
+        - fiotest:
+            avocadotest = "io/disk/fiotest.py"
+        - fs_mark:
+            avocadotest = "io/disk/fs_mark.py"
+        - iozone:
+            avocadotest = "io/disk/iozone.py"
+        - ltp_fs:
+            avocadotest = "io/disk/ltp_fs.py"
+        - parallel_dd;
+            avocadotest = "io/disk/parallel_dd.py"
+        - tiobench:
+            avocadotest = "io/disk/tiobench.py"
+        - module_unload_load:
+            avocadotest = "io/disk/module_unload_load.py"
+        - kselftest:
+            avocadotest = "kernel/kselftest.py"
+        - posixtest:
+            avocadotest = "kernel/posixtest.py"
+        - rmaptest:
+            avocadotest = "kernel/rmaptest.py"
+        - dma_memtest:
+            avocadotest = "memory/dma_memtest.py"
+        - eatmemory:
+            avocadotest = "memory/eatmemory.py"
+        - memintegrity:
+            avocadotest = "memory/integrity.py"
+        - memtester:
+            avocadotest = "memory/memtester.py"
+        - stutter:
+            avocadotest = "memory/stutter.py"
+        - THP:
+            avocadotest = "memory/transparent_hugepages.py,memory/transparent_hugepages_defrag.py"
+            avocadotest += ",memory/transparent_hugepages_swapping.py"
+            avocadomux = ",,"
+        - aiostress:
+            avocadotest = "perf/aiostress.py"
+        - blogbench:
+            avocadotest = "perf/blogbench.py"
+        - compilebench:
+            avocadotest = "perf/compilebench.py"
+        - hackbench:
+            avocadotest = "perf/hackbench.py"
+        - stress:
+            avocadotest = "perf/stress.py"
+        - tbench:
+            avocadotest = "perf/tbench.py"
+        - unixbench:
+            avocadotest = "perf/unixbench.py"