diff --git a/src/tools/genpolicy/tests/main.rs b/src/tools/genpolicy/tests/policy/main.rs
similarity index 99%
rename from src/tools/genpolicy/tests/main.rs
rename to src/tools/genpolicy/tests/policy/main.rs
index 04f6f32e92..8454ade8ed 100644
--- a/src/tools/genpolicy/tests/main.rs
+++ b/src/tools/genpolicy/tests/policy/main.rs
@@ -68,7 +68,7 @@ mod tests {
             .expect("should be able to create directories under CARGO_TARGET_TMPDIR");
 
         let testdata_dir = path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .join("tests/testdata")
+            .join("tests/policy/testdata")
             .join(test_case_dir);
         fs::copy(testdata_dir.join("pod.yaml"), workdir.join("pod.yaml"))
             .expect("copying files around should not fail");
diff --git a/src/tools/genpolicy/tests/testdata/copyfile/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/copyfile/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/copyfile/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/copyfile/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/copyfile/testcases.json b/src/tools/genpolicy/tests/policy/testdata/copyfile/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/copyfile/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/copyfile/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/generate_name/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/generate_name/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/generate_name/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/generate_name/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/generate_name/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/generate_name/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/generate_name/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/generate_name/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/network_namespace/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/network_namespace/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/network_namespace/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/network_namespace/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/network_namespace/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/network_namespace/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/network_namespace/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/network_namespace/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/security_context/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/security_context/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/security_context/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/security_context/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/security_context/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/sysctls/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/sysctls/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/sysctls/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/sysctls/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/sysctls/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/sysctls/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/sysctls/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/sysctls/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/volumes/emptydir/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createcontainer/volumes/emptydir/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/volumes/emptydir/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/volumes/emptydir/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/createcontainer/volumes/emptydir/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createcontainer/volumes/emptydir/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createcontainer/volumes/emptydir/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/createcontainer/volumes/emptydir/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/createsandbox/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/createsandbox/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createsandbox/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/createsandbox/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/createsandbox/testcases.json b/src/tools/genpolicy/tests/policy/testdata/createsandbox/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/createsandbox/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/createsandbox/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/state/createcontainer/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/state/createcontainer/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/state/createcontainer/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/state/createcontainer/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/state/createcontainer/testcases.json b/src/tools/genpolicy/tests/policy/testdata/state/createcontainer/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/state/createcontainer/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/state/createcontainer/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/state/execprocess/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/state/execprocess/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/state/execprocess/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/state/execprocess/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/state/execprocess/testcases.json b/src/tools/genpolicy/tests/policy/testdata/state/execprocess/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/state/execprocess/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/state/execprocess/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/updateinterface/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/updateinterface/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/updateinterface/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/updateinterface/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/updateinterface/testcases.json b/src/tools/genpolicy/tests/policy/testdata/updateinterface/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/updateinterface/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/updateinterface/testcases.json
diff --git a/src/tools/genpolicy/tests/testdata/updateroutes/pod.yaml b/src/tools/genpolicy/tests/policy/testdata/updateroutes/pod.yaml
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/updateroutes/pod.yaml
rename to src/tools/genpolicy/tests/policy/testdata/updateroutes/pod.yaml
diff --git a/src/tools/genpolicy/tests/testdata/updateroutes/testcases.json b/src/tools/genpolicy/tests/policy/testdata/updateroutes/testcases.json
similarity index 100%
rename from src/tools/genpolicy/tests/testdata/updateroutes/testcases.json
rename to src/tools/genpolicy/tests/policy/testdata/updateroutes/testcases.json