diff --git a/conformance/src/test/java/dev/cel/conformance/policy/BUILD.bazel b/conformance/src/test/java/dev/cel/conformance/policy/BUILD.bazel
index 236bacd93..ca34530fb 100644
--- a/conformance/src/test/java/dev/cel/conformance/policy/BUILD.bazel
+++ b/conformance/src/test/java/dev/cel/conformance/policy/BUILD.bazel
@@ -19,6 +19,7 @@ java_library(
         "//testing/testrunner:cel_test_suite_text_proto_parser",
         "//testing/testrunner:cel_test_suite_yaml_parser",
         "//testing/testrunner:test_runner_library",
+        "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:junit_junit",
diff --git a/conformance/src/test/java/dev/cel/conformance/policy/PolicyConformanceTest.java b/conformance/src/test/java/dev/cel/conformance/policy/PolicyConformanceTest.java
index 5d6c84dcd..cd24339c0 100644
--- a/conformance/src/test/java/dev/cel/conformance/policy/PolicyConformanceTest.java
+++ b/conformance/src/test/java/dev/cel/conformance/policy/PolicyConformanceTest.java
@@ -14,11 +14,10 @@
 
 package dev.cel.conformance.policy;
 
-import com.google.protobuf.ListValue;
 import com.google.protobuf.Struct;
-import com.google.protobuf.Value;
 import dev.cel.bundle.Cel;
 import dev.cel.bundle.CelFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.runtime.CelFunctionBinding;
 import dev.cel.testing.testrunner.CelExpressionSource;
 import dev.cel.testing.testrunner.CelTestContext;
@@ -74,8 +73,9 @@ public void evaluate() throws Throwable {
         CelTestContext.newBuilder()
             .setCelExpression(CelExpressionSource.fromSource(policyFile))
             .setCel(CEL)
-            .addMessageTypes(
-                Struct.getDescriptor(), Value.getDescriptor(), ListValue.getDescriptor());
+            .addFileTypes(
+                TestAllTypes.getDescriptor().getFile(),
+                Struct.getDescriptor().getFile());
 
     Path yamlConfigPath = Paths.get(dirPath, "config.yaml");
     Path textprotoConfigPath = Paths.get(dirPath, "config.textproto");