diff --git a/testdata/grpc-version.json b/testdata/gnsi/grpc-version.json
similarity index 100%
rename from testdata/grpc-version.json
rename to testdata/gnsi/grpc-version.json
diff --git a/testdata/crl/client_1_cert.pem b/testdata/mtls/client_1_cert.pem
similarity index 100%
rename from testdata/crl/client_1_cert.pem
rename to testdata/mtls/client_1_cert.pem
diff --git a/testdata/crl/client_1_key.pem b/testdata/mtls/client_1_key.pem
similarity index 100%
rename from testdata/crl/client_1_key.pem
rename to testdata/mtls/client_1_key.pem
diff --git a/testdata/crl/client_2_cert.pem b/testdata/mtls/client_2_cert.pem
similarity index 100%
rename from testdata/crl/client_2_cert.pem
rename to testdata/mtls/client_2_cert.pem
diff --git a/testdata/crl/client_2_key.pem b/testdata/mtls/client_2_key.pem
similarity index 100%
rename from testdata/crl/client_2_key.pem
rename to testdata/mtls/client_2_key.pem
diff --git a/testdata/crl/039bd53b.r0 b/testdata/mtls/gold/039bd53b.r0
similarity index 100%
rename from testdata/crl/039bd53b.r0
rename to testdata/mtls/gold/039bd53b.r0
diff --git a/testdata/crl/ca.pem b/testdata/mtls/gold/ca.pem
similarity index 100%
rename from testdata/crl/ca.pem
rename to testdata/mtls/gold/ca.pem
diff --git a/testdata/crl/server_1_cert.pem b/testdata/mtls/gold/server_1_cert.pem
similarity index 100%
rename from testdata/crl/server_1_cert.pem
rename to testdata/mtls/gold/server_1_cert.pem
diff --git a/testdata/crl/server_1_key.pem b/testdata/mtls/gold/server_1_key.pem
similarity index 100%
rename from testdata/crl/server_1_key.pem
rename to testdata/mtls/gold/server_1_key.pem
diff --git a/testdata/crl/server_2_cert.pem b/testdata/mtls/gold/server_2_cert.pem
similarity index 100%
rename from testdata/crl/server_2_cert.pem
rename to testdata/mtls/gold/server_2_cert.pem
diff --git a/testdata/crl/server_2_key.pem b/testdata/mtls/gold/server_2_key.pem
similarity index 100%
rename from testdata/crl/server_2_key.pem
rename to testdata/mtls/gold/server_2_key.pem