diff --git a/.github/actions/config-variations/action.yml b/.github/actions/config-variations/action.yml
index 65b2cb1c3..0f94f6e83 100644
--- a/.github/actions/config-variations/action.yml
+++ b/.github/actions/config-variations/action.yml
@@ -37,7 +37,7 @@ runs:
       shell: bash
       run: |
         make clean
-        CFLAGS='-Itest -DMLD_CONFIG_FILE=\"break_pct_config.h\"' make func -j4
+        CFLAGS='-Itest -DMLD_CONFIG_FILE=\"configs/break_pct_config.h\"' make func -j4
         # PCT breakage is done at runtime via MLD_BREAK_PCT
         make run_func                 # Should be OK
         MLD_BREAK_PCT=0 make run_func # Should be OK
@@ -53,7 +53,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_heap_alloc_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_heap_alloc_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -69,7 +69,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_zeroize_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_zeroize_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -84,7 +84,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_native_capability_config_1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -99,7 +99,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_0.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_native_capability_config_0.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -114,7 +114,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -march=armv8.4-a+sha3 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_ID_AA64PFR1_EL1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -march=armv8.4-a+sha3 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_native_capability_config_ID_AA64PFR1_EL1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -129,7 +129,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -mavx2 -mbmi2 -mpopcnt -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_CPUID_AVX2.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -mavx2 -mbmi2 -mpopcnt -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_native_capability_config_CPUID_AVX2.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -144,7 +144,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"no_asm_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/no_asm_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -159,7 +159,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"serial_fips202_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/serial_fips202_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -174,7 +174,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_randombytes_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_randombytes_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -189,7 +189,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_memcpy_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_memcpy_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -204,7 +204,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_memset_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_memset_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
@@ -219,7 +219,7 @@ runs:
       with:
         gh_token: ${{ inputs.gh_token }}
         compile_mode: native
-        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_stdlib_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
+        cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"configs/custom_stdlib_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
         func: true
         kat: true
diff --git a/BIBLIOGRAPHY.md b/BIBLIOGRAPHY.md
index f6df9b81d..e243111e3 100644
--- a/BIBLIOGRAPHY.md
+++ b/BIBLIOGRAPHY.md
@@ -39,21 +39,21 @@ source code and documentation.
   - [integration/liboqs/config_x86_64.h](integration/liboqs/config_x86_64.h)
   - [mldsa/mldsa_native_config.h](mldsa/mldsa_native_config.h)
   - [mldsa/src/sign.c](mldsa/src/sign.c)
-  - [test/break_pct_config.h](test/break_pct_config.h)
-  - [test/custom_heap_alloc_config.h](test/custom_heap_alloc_config.h)
-  - [test/custom_memcpy_config.h](test/custom_memcpy_config.h)
-  - [test/custom_memset_config.h](test/custom_memset_config.h)
-  - [test/custom_native_capability_config_0.h](test/custom_native_capability_config_0.h)
-  - [test/custom_native_capability_config_1.h](test/custom_native_capability_config_1.h)
-  - [test/custom_native_capability_config_CPUID_AVX2.h](test/custom_native_capability_config_CPUID_AVX2.h)
-  - [test/custom_native_capability_config_ID_AA64PFR1_EL1.h](test/custom_native_capability_config_ID_AA64PFR1_EL1.h)
-  - [test/custom_randombytes_config.h](test/custom_randombytes_config.h)
-  - [test/custom_stdlib_config.h](test/custom_stdlib_config.h)
-  - [test/custom_zeroize_config.h](test/custom_zeroize_config.h)
-  - [test/no_asm_config.h](test/no_asm_config.h)
-  - [test/serial_fips202_config.h](test/serial_fips202_config.h)
-  - [test/test_alloc_config.h](test/test_alloc_config.h)
-  - [test/test_rng_fail_config.h](test/test_rng_fail_config.h)
+  - [test/configs/break_pct_config.h](test/configs/break_pct_config.h)
+  - [test/configs/custom_heap_alloc_config.h](test/configs/custom_heap_alloc_config.h)
+  - [test/configs/custom_memcpy_config.h](test/configs/custom_memcpy_config.h)
+  - [test/configs/custom_memset_config.h](test/configs/custom_memset_config.h)
+  - [test/configs/custom_native_capability_config_0.h](test/configs/custom_native_capability_config_0.h)
+  - [test/configs/custom_native_capability_config_1.h](test/configs/custom_native_capability_config_1.h)
+  - [test/configs/custom_native_capability_config_CPUID_AVX2.h](test/configs/custom_native_capability_config_CPUID_AVX2.h)
+  - [test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h](test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h)
+  - [test/configs/custom_randombytes_config.h](test/configs/custom_randombytes_config.h)
+  - [test/configs/custom_stdlib_config.h](test/configs/custom_stdlib_config.h)
+  - [test/configs/custom_zeroize_config.h](test/configs/custom_zeroize_config.h)
+  - [test/configs/no_asm_config.h](test/configs/no_asm_config.h)
+  - [test/configs/serial_fips202_config.h](test/configs/serial_fips202_config.h)
+  - [test/configs/test_alloc_config.h](test/configs/test_alloc_config.h)
+  - [test/configs/test_rng_fail_config.h](test/configs/test_rng_fail_config.h)
 
 ### `FIPS202`
 
@@ -95,20 +95,20 @@ source code and documentation.
   - [mldsa/src/rounding.h](mldsa/src/rounding.h)
   - [mldsa/src/sign.c](mldsa/src/sign.c)
   - [mldsa/src/sign.h](mldsa/src/sign.h)
-  - [test/break_pct_config.h](test/break_pct_config.h)
-  - [test/custom_memcpy_config.h](test/custom_memcpy_config.h)
-  - [test/custom_memset_config.h](test/custom_memset_config.h)
-  - [test/custom_native_capability_config_0.h](test/custom_native_capability_config_0.h)
-  - [test/custom_native_capability_config_1.h](test/custom_native_capability_config_1.h)
-  - [test/custom_native_capability_config_CPUID_AVX2.h](test/custom_native_capability_config_CPUID_AVX2.h)
-  - [test/custom_native_capability_config_ID_AA64PFR1_EL1.h](test/custom_native_capability_config_ID_AA64PFR1_EL1.h)
-  - [test/custom_randombytes_config.h](test/custom_randombytes_config.h)
-  - [test/custom_stdlib_config.h](test/custom_stdlib_config.h)
-  - [test/custom_zeroize_config.h](test/custom_zeroize_config.h)
-  - [test/no_asm_config.h](test/no_asm_config.h)
-  - [test/serial_fips202_config.h](test/serial_fips202_config.h)
-  - [test/test_alloc_config.h](test/test_alloc_config.h)
-  - [test/test_rng_fail_config.h](test/test_rng_fail_config.h)
+  - [test/configs/break_pct_config.h](test/configs/break_pct_config.h)
+  - [test/configs/custom_memcpy_config.h](test/configs/custom_memcpy_config.h)
+  - [test/configs/custom_memset_config.h](test/configs/custom_memset_config.h)
+  - [test/configs/custom_native_capability_config_0.h](test/configs/custom_native_capability_config_0.h)
+  - [test/configs/custom_native_capability_config_1.h](test/configs/custom_native_capability_config_1.h)
+  - [test/configs/custom_native_capability_config_CPUID_AVX2.h](test/configs/custom_native_capability_config_CPUID_AVX2.h)
+  - [test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h](test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h)
+  - [test/configs/custom_randombytes_config.h](test/configs/custom_randombytes_config.h)
+  - [test/configs/custom_stdlib_config.h](test/configs/custom_stdlib_config.h)
+  - [test/configs/custom_zeroize_config.h](test/configs/custom_zeroize_config.h)
+  - [test/configs/no_asm_config.h](test/configs/no_asm_config.h)
+  - [test/configs/serial_fips202_config.h](test/configs/serial_fips202_config.h)
+  - [test/configs/test_alloc_config.h](test/configs/test_alloc_config.h)
+  - [test/configs/test_rng_fail_config.h](test/configs/test_rng_fail_config.h)
 
 ### `HYBRID`
 
diff --git a/scripts/autogen b/scripts/autogen
index e515a1a1f..6417d9ecd 100755
--- a/scripts/autogen
+++ b/scripts/autogen
@@ -3054,7 +3054,7 @@ def gen_test_config(config_path, config_spec, default_config_content):
 def gen_test_configs():
     """Generate all test configuration files from metadata."""
     # Load metadata
-    metadata = yaml.safe_load(read_file("test/configs.yml"))
+    metadata = yaml.safe_load(read_file("test/configs/configs.yml"))
 
     # Load default config
     default_config = read_file("mldsa/mldsa_native_config.h")
diff --git a/test/break_pct_config.h b/test/configs/break_pct_config.h
similarity index 100%
rename from test/break_pct_config.h
rename to test/configs/break_pct_config.h
diff --git a/test/configs.yml b/test/configs/configs.yml
similarity index 95%
rename from test/configs.yml
rename to test/configs/configs.yml
index 0e81b00f7..26c8f5e82 100644
--- a/test/configs.yml
+++ b/test/configs/configs.yml
@@ -6,7 +6,7 @@
 # Each entry describes how a test config differs from mldsa/mldsa_native_config.h
 
 configs:
-  - path: test/no_asm_config.h
+  - path: test/configs/no_asm_config.h
     description: "Test configuration with no assembly code"
     defines:
       MLD_CONFIG_NO_ASM: true
@@ -23,12 +23,12 @@ configs:
           }
           #endif
 
-  - path: test/serial_fips202_config.h
+  - path: test/configs/serial_fips202_config.h
     description: "Test configuration with serial FIPS202 only"
     defines:
       MLD_CONFIG_SERIAL_FIPS202_ONLY: true
 
-  - path: test/custom_randombytes_config.h
+  - path: test/configs/custom_randombytes_config.h
     description: "Test configuration with custom randombytes"
     defines:
       MLD_CONFIG_CUSTOM_RANDOMBYTES:
@@ -44,7 +44,7 @@ configs:
           }
           #endif /* !__ASSEMBLER__ */
 
-  - path: test/custom_zeroize_config.h
+  - path: test/configs/custom_zeroize_config.h
     description: "Test configuration with custom zeroize"
     defines:
       MLD_CONFIG_CUSTOM_ZEROIZE:
@@ -60,7 +60,7 @@ configs:
           }
           #endif
 
-  - path: test/custom_memcpy_config.h
+  - path: test/configs/custom_memcpy_config.h
     description: "Test configuration with custom memcpy"
     defines:
       MLD_CONFIG_CUSTOM_MEMCPY:
@@ -83,7 +83,7 @@ configs:
           }
           #endif /* !__ASSEMBLER__ */
 
-  - path: test/custom_memset_config.h
+  - path: test/configs/custom_memset_config.h
     description: "Test configuration with custom memset"
     defines:
       MLD_CONFIG_CUSTOM_MEMSET:
@@ -105,7 +105,7 @@ configs:
           }
           #endif
 
-  - path: test/custom_stdlib_config.h
+  - path: test/configs/custom_stdlib_config.h
     description: "Test configuration with custom stdlib functions"
     defines:
       MLD_CONFIG_CUSTOM_MEMCPY:
@@ -146,7 +146,7 @@ configs:
           }
           #endif
 
-  - path: test/break_pct_config.h
+  - path: test/configs/break_pct_config.h
     description: "Test configuration for PCT breakage testing"
     defines:
       MLD_CONFIG_KEYGEN_PCT: true
@@ -165,7 +165,7 @@ configs:
           }
           #endif
 
-  - path: test/custom_native_capability_config_0.h
+  - path: test/configs/custom_native_capability_config_0.h
     description: "Test configuration with custom capability function returning 0"
     defines:
       MLD_CONFIG_CUSTOM_CAPABILITY_FUNC:
@@ -182,7 +182,7 @@ configs:
           }
           #endif /* !__ASSEMBLER__ */
 
-  - path: test/custom_native_capability_config_1.h
+  - path: test/configs/custom_native_capability_config_1.h
     description: "Test configuration with custom capability function returning 1"
     defines:
       MLD_CONFIG_CUSTOM_CAPABILITY_FUNC:
@@ -198,7 +198,7 @@ configs:
           }
           #endif /* !__ASSEMBLER__ */
 
-  - path: test/custom_native_capability_config_CPUID_AVX2.h
+  - path: test/configs/custom_native_capability_config_CPUID_AVX2.h
     description: "Test configuration with CPUID-based AVX2 capability detection"
     defines:
       MLD_CONFIG_CUSTOM_CAPABILITY_FUNC:
@@ -246,7 +246,7 @@ configs:
           }
           #endif /* !__ASSEMBLER__ */
 
-  - path: test/custom_native_capability_config_ID_AA64PFR1_EL1.h
+  - path: test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h
     description: "Test configuration with ARM system register capability detection"
     defines:
       MLD_CONFIG_CUSTOM_CAPABILITY_FUNC:
@@ -405,7 +405,7 @@ configs:
       MLD_CONFIG_FILE:
         comment: "/* No need to set this -- we _are_ already in a custom config */"
 
-  - path: test/test_alloc_config.h
+  - path: test/configs/test_alloc_config.h
     description: "Using custom allocation that can be made fail at specific invocation"
     defines:
       MLD_CONFIG_NAMESPACE_PREFIX: mld
@@ -427,7 +427,7 @@ configs:
       MLD_CONFIG_FILE:
         comment: "/* No need to set this -- we _are_ already in a custom config */"
 
-  - path: test/test_rng_fail_config.h
+  - path: test/configs/test_rng_fail_config.h
     description: "Using custom randombytes that can fail at specific invocation"
     defines:
       MLD_CONFIG_NAMESPACE_PREFIX: mld
diff --git a/test/custom_heap_alloc_config.h b/test/configs/custom_heap_alloc_config.h
similarity index 100%
rename from test/custom_heap_alloc_config.h
rename to test/configs/custom_heap_alloc_config.h
diff --git a/test/custom_memcpy_config.h b/test/configs/custom_memcpy_config.h
similarity index 100%
rename from test/custom_memcpy_config.h
rename to test/configs/custom_memcpy_config.h
diff --git a/test/custom_memset_config.h b/test/configs/custom_memset_config.h
similarity index 100%
rename from test/custom_memset_config.h
rename to test/configs/custom_memset_config.h
diff --git a/test/custom_native_capability_config_0.h b/test/configs/custom_native_capability_config_0.h
similarity index 100%
rename from test/custom_native_capability_config_0.h
rename to test/configs/custom_native_capability_config_0.h
diff --git a/test/custom_native_capability_config_1.h b/test/configs/custom_native_capability_config_1.h
similarity index 100%
rename from test/custom_native_capability_config_1.h
rename to test/configs/custom_native_capability_config_1.h
diff --git a/test/custom_native_capability_config_CPUID_AVX2.h b/test/configs/custom_native_capability_config_CPUID_AVX2.h
similarity index 100%
rename from test/custom_native_capability_config_CPUID_AVX2.h
rename to test/configs/custom_native_capability_config_CPUID_AVX2.h
diff --git a/test/custom_native_capability_config_ID_AA64PFR1_EL1.h b/test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h
similarity index 100%
rename from test/custom_native_capability_config_ID_AA64PFR1_EL1.h
rename to test/configs/custom_native_capability_config_ID_AA64PFR1_EL1.h
diff --git a/test/custom_randombytes_config.h b/test/configs/custom_randombytes_config.h
similarity index 100%
rename from test/custom_randombytes_config.h
rename to test/configs/custom_randombytes_config.h
diff --git a/test/custom_stdlib_config.h b/test/configs/custom_stdlib_config.h
similarity index 100%
rename from test/custom_stdlib_config.h
rename to test/configs/custom_stdlib_config.h
diff --git a/test/custom_zeroize_config.h b/test/configs/custom_zeroize_config.h
similarity index 100%
rename from test/custom_zeroize_config.h
rename to test/configs/custom_zeroize_config.h
diff --git a/test/no_asm_config.h b/test/configs/no_asm_config.h
similarity index 100%
rename from test/no_asm_config.h
rename to test/configs/no_asm_config.h
diff --git a/test/serial_fips202_config.h b/test/configs/serial_fips202_config.h
similarity index 100%
rename from test/serial_fips202_config.h
rename to test/configs/serial_fips202_config.h
diff --git a/test/test_alloc_config.h b/test/configs/test_alloc_config.h
similarity index 100%
rename from test/test_alloc_config.h
rename to test/configs/test_alloc_config.h
diff --git a/test/test_rng_fail_config.h b/test/configs/test_rng_fail_config.h
similarity index 100%
rename from test/test_rng_fail_config.h
rename to test/configs/test_rng_fail_config.h
diff --git a/test/mk/components.mk b/test/mk/components.mk
index 41e7d31f7..cde8878a1 100644
--- a/test/mk/components.mk
+++ b/test/mk/components.mk
@@ -37,19 +37,19 @@ $(MLDSA87_UNIT_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87 -DMLD_STATIC_TESTA
 
 # Alloc test object files - same sources but with custom alloc config
 MLDSA44_ALLOC_OBJS = $(call MAKE_OBJS,$(MLDSA44_DIR)/alloc,$(SOURCES) $(FIPS202_SRCS))
-$(MLDSA44_ALLOC_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=44 -DMLD_CONFIG_FILE=\"../test/test_alloc_config.h\"
+$(MLDSA44_ALLOC_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=44 -DMLD_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
 MLDSA65_ALLOC_OBJS = $(call MAKE_OBJS,$(MLDSA65_DIR)/alloc,$(SOURCES) $(FIPS202_SRCS))
-$(MLDSA65_ALLOC_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=65 -DMLD_CONFIG_FILE=\"../test/test_alloc_config.h\"
+$(MLDSA65_ALLOC_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=65 -DMLD_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
 MLDSA87_ALLOC_OBJS = $(call MAKE_OBJS,$(MLDSA87_DIR)/alloc,$(SOURCES) $(FIPS202_SRCS))
-$(MLDSA87_ALLOC_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87 -DMLD_CONFIG_FILE=\"../test/test_alloc_config.h\"
+$(MLDSA87_ALLOC_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87 -DMLD_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
 
 # RNG fail test object files - same sources but with custom randombytes config
 MLDSA44_RNG_FAIL_OBJS = $(call MAKE_OBJS,$(MLDSA44_DIR)/rng_fail,$(SOURCES) $(FIPS202_SRCS))
-$(MLDSA44_RNG_FAIL_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=44 -DMLD_CONFIG_FILE=\"../test/test_rng_fail_config.h\"
+$(MLDSA44_RNG_FAIL_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=44 -DMLD_CONFIG_FILE=\"../test/configs/test_rng_fail_config.h\"
 MLDSA65_RNG_FAIL_OBJS = $(call MAKE_OBJS,$(MLDSA65_DIR)/rng_fail,$(SOURCES) $(FIPS202_SRCS))
-$(MLDSA65_RNG_FAIL_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=65 -DMLD_CONFIG_FILE=\"../test/test_rng_fail_config.h\"
+$(MLDSA65_RNG_FAIL_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=65 -DMLD_CONFIG_FILE=\"../test/configs/test_rng_fail_config.h\"
 MLDSA87_RNG_FAIL_OBJS = $(call MAKE_OBJS,$(MLDSA87_DIR)/rng_fail,$(SOURCES) $(FIPS202_SRCS))
-$(MLDSA87_RNG_FAIL_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87 -DMLD_CONFIG_FILE=\"../test/test_rng_fail_config.h\"
+$(MLDSA87_RNG_FAIL_OBJS): CFLAGS += -DMLD_CONFIG_PARAMETER_SET=87 -DMLD_CONFIG_FILE=\"../test/configs/test_rng_fail_config.h\"
 
 
 CFLAGS += -Imldsa
@@ -86,13 +86,13 @@ $(MLDSA44_DIR)/bin/test_stack44: CFLAGS += -Imldsa -fstack-usage
 $(MLDSA65_DIR)/bin/test_stack65: CFLAGS += -Imldsa -fstack-usage
 $(MLDSA87_DIR)/bin/test_stack87: CFLAGS += -Imldsa -fstack-usage
 
-$(MLDSA44_DIR)/test/test_alloc.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/test_alloc_config.h\"
-$(MLDSA65_DIR)/test/test_alloc.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/test_alloc_config.h\"
-$(MLDSA87_DIR)/test/test_alloc.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/test_alloc_config.h\"
+$(MLDSA44_DIR)/test/test_alloc.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
+$(MLDSA65_DIR)/test/test_alloc.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
+$(MLDSA87_DIR)/test/test_alloc.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/configs/test_alloc_config.h\"
 
-$(MLDSA44_DIR)/test/test_rng_fail.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/test_rng_fail_config.h\"
-$(MLDSA65_DIR)/test/test_rng_fail.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/test_rng_fail_config.h\"
-$(MLDSA87_DIR)/test/test_rng_fail.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/test_rng_fail_config.h\"
+$(MLDSA44_DIR)/test/test_rng_fail.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/configs/test_rng_fail_config.h\"
+$(MLDSA65_DIR)/test/test_rng_fail.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/configs/test_rng_fail_config.h\"
+$(MLDSA87_DIR)/test/test_rng_fail.c.o: CFLAGS += -DMLD_CONFIG_FILE=\"../test/configs/test_rng_fail_config.h\"
 
 $(MLDSA44_DIR)/bin/test_unit44: CFLAGS += -DMLD_STATIC_TESTABLE= -Wno-missing-prototypes
 $(MLDSA65_DIR)/bin/test_unit65: CFLAGS += -DMLD_STATIC_TESTABLE= -Wno-missing-prototypes