diff --git a/generate_test.py b/generate_test.py
index f79fc92aa4141acc85b7cf5a0c2e2c62e0fd653d..02e2bbf4fcd6618f880a375100dd6f3b54b39bf2 100755
--- a/generate_test.py
+++ b/generate_test.py
@@ -112,8 +112,24 @@ def create_experiment_setup(experiment, lab) -> list[Path]:
     cfgs = list()
     for cat in categories:
         suffix = cat + f"-lab_{lab}"
-        input_path = base_path.joinpath(f"proc_input_{lab}").joinpath(cat)
-        output_path = base_path.joinpath(f"proc_output_{lab}").joinpath(cat)
+
+        input_path = base_path.joinpath(f"proc_input_{lab}")
+        output_path = base_path.joinpath(f"proc_output_{lab}")
+
+        fmt_for_category = IN_FMT_FOR_MASA_EXPS.get(experiment, None)
+        if experiment in EXPERIMENTS_P800:
+            input_path = input_path.joinpath(cat)
+            output_path = output_path.joinpath(cat)
+            cfg_path = default_cfg_path.parent.joinpath(f"{experiment}-{cat}-lab_{lab}.yml")
+        # this is for catching the Mushra MASA tests
+        elif experiment in IN_FMT_FOR_MASA_EXPS:
+            fmt = fmt_for_category[cat]
+            input_path = input_path.joinpath(fmt)
+            output_path = output_path.joinpath(fmt)
+            cfg_path = default_cfg_path.parent.joinpath(f"{experiment}-{fmt}-lab_{lab}.yml")
+        elif experiment in EXPERIMENTS_BS1534:
+            cfg_path = default_cfg_path.parent.joinpath(f"{experiment}-lab_{lab}.yml")
+
         if experiment == "P800-2":
             bg_noise_path = base_path.joinpath("background_noise").joinpath(
                 f"background_noise_{suffix}.wav"
@@ -122,7 +138,7 @@ def create_experiment_setup(experiment, lab) -> list[Path]:
             bg_noise_path = base_path.joinpath("background_noise").joinpath(
                 f"background_noise_{cat}.wav"
             )
-        cfg_path = default_cfg_path.parent.joinpath(f"{experiment}{cat}-lab_{lab}.yml")
+
         cfgs.append(cfg_path)
 
         # set new lab- and category-dependent values
@@ -147,7 +163,7 @@ def create_experiment_setup(experiment, lab) -> list[Path]:
             )
 
         # for MASA, the input format can differ between categories
-        if (fmt_for_category := IN_FMT_FOR_MASA_EXPS.get(experiment, None)) is not None:
+        if fmt_for_category is not None:
             cfg.input["fmt"] = fmt_for_category[cat]
 
         # ensure that necessary directories are there