diff --git a/common/src/test/java/dev/cel/common/ast/BUILD.bazel b/common/src/test/java/dev/cel/common/ast/BUILD.bazel
index 84892003..429edb3b 100644
--- a/common/src/test/java/dev/cel/common/ast/BUILD.bazel
+++ b/common/src/test/java/dev/cel/common/ast/BUILD.bazel
@@ -30,7 +30,7 @@ java_library(
         "//parser:macro",
         "//parser:operator",
         "@cel_spec//proto/cel/expr:expr_java_proto",
-        "@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
+        "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@com_google_googleapis//google/api/expr/v1alpha1:expr_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_guava_guava_testlib",
diff --git a/common/src/test/java/dev/cel/common/ast/CelExprFormatterTest.java b/common/src/test/java/dev/cel/common/ast/CelExprFormatterTest.java
index fee0ef6f..002d9d2a 100644
--- a/common/src/test/java/dev/cel/common/ast/CelExprFormatterTest.java
+++ b/common/src/test/java/dev/cel/common/ast/CelExprFormatterTest.java
@@ -16,7 +16,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
 import com.google.testing.junit.testparameterinjector.TestParameter;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import dev.cel.common.CelAbstractSyntaxTree;
@@ -26,6 +25,7 @@
 import dev.cel.common.types.StructTypeReference;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.extensions.CelOptionalLibrary;
 import dev.cel.parser.CelStandardMacro;
 import org.junit.Test;
@@ -173,7 +173,7 @@ public void list() throws Exception {
   public void struct() throws Exception {
     CelCompiler celCompiler =
         CelCompilerFactory.standardCelCompilerBuilder()
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .addMessageTypes(TestAllTypes.getDescriptor())
             .addLibraries(CelOptionalLibrary.INSTANCE)
             .build();
@@ -223,7 +223,7 @@ public void struct() throws Exception {
   public void map() throws Exception {
     CelCompiler celCompiler =
         CelCompilerFactory.standardCelCompilerBuilder()
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .addMessageTypes(TestAllTypes.getDescriptor())
             .addLibraries(CelOptionalLibrary.INSTANCE)
             .build();
diff --git a/common/src/test/java/dev/cel/common/ast/CelExprVisitorTest.java b/common/src/test/java/dev/cel/common/ast/CelExprVisitorTest.java
index f27c8a34..ef1188ee 100644
--- a/common/src/test/java/dev/cel/common/ast/CelExprVisitorTest.java
+++ b/common/src/test/java/dev/cel/common/ast/CelExprVisitorTest.java
@@ -17,7 +17,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import dev.cel.common.CelAbstractSyntaxTree;
@@ -32,6 +31,7 @@
 import dev.cel.common.types.SimpleType;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.parser.CelStandardMacro;
 import dev.cel.parser.Operator;
 import java.util.Optional;
diff --git a/common/src/test/java/dev/cel/common/internal/BUILD.bazel b/common/src/test/java/dev/cel/common/internal/BUILD.bazel
index d29f67a5..466a6d27 100644
--- a/common/src/test/java/dev/cel/common/internal/BUILD.bazel
+++ b/common/src/test/java/dev/cel/common/internal/BUILD.bazel
@@ -31,8 +31,8 @@ java_library(
         "//common/src/test/resources:service_conflicting_name_java_proto",
         "//common/src/test/resources:single_file_java_proto",
         "//common/testing",
+        "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@cel_spec//proto/test/v1/proto2:test_all_types_java_proto",
-        "@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
         "@com_google_googleapis//google/type:type_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
diff --git a/common/src/test/java/dev/cel/common/internal/DefaultInstanceMessageFactoryTest.java b/common/src/test/java/dev/cel/common/internal/DefaultInstanceMessageFactoryTest.java
index c035db24..4fc36f1b 100644
--- a/common/src/test/java/dev/cel/common/internal/DefaultInstanceMessageFactoryTest.java
+++ b/common/src/test/java/dev/cel/common/internal/DefaultInstanceMessageFactoryTest.java
@@ -18,7 +18,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.Arrays.stream;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.Descriptors.Descriptor;
@@ -32,6 +31,7 @@
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import dev.cel.common.testdata.ProtoJavaApiVersion1.Proto2JavaVersion1Message;
 import dev.cel.common.testing.RepeatedTestProvider;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
diff --git a/common/src/test/java/dev/cel/common/internal/DefaultMessageFactoryTest.java b/common/src/test/java/dev/cel/common/internal/DefaultMessageFactoryTest.java
index 16f17074..b26197d0 100644
--- a/common/src/test/java/dev/cel/common/internal/DefaultMessageFactoryTest.java
+++ b/common/src/test/java/dev/cel/common/internal/DefaultMessageFactoryTest.java
@@ -17,7 +17,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.api.expr.test.v1.proto2.TestAllTypesProto.TestAllTypes;
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -30,6 +29,7 @@
 import dev.cel.common.CelDescriptorUtil;
 import dev.cel.common.CelDescriptors;
 import dev.cel.common.internal.ProtoMessageFactory.CombinedMessageFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import java.util.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -59,7 +59,7 @@ public void newBuilder_withDescriptor_producesNewMessageBuilder() {
 
     TestAllTypes.Builder builder =
         (TestAllTypes.Builder)
-            messageFactory.newBuilder("google.api.expr.test.v1.proto2.TestAllTypes").get();
+            messageFactory.newBuilder("cel.expr.conformance.proto3.TestAllTypes").get();
 
     assertThat(builder.setSingleInt64(5L).build())
         .isEqualTo(TestAllTypes.newBuilder().setSingleInt64(5L).build());
diff --git a/common/src/test/java/dev/cel/common/internal/ProtoEqualityTest.java b/common/src/test/java/dev/cel/common/internal/ProtoEqualityTest.java
index 722d088b..d35947b9 100644
--- a/common/src/test/java/dev/cel/common/internal/ProtoEqualityTest.java
+++ b/common/src/test/java/dev/cel/common/internal/ProtoEqualityTest.java
@@ -16,14 +16,14 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes.NestedEnum;
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes.NestedMessage;
 import com.google.protobuf.Any;
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
+import dev.cel.expr.conformance.proto3.TestAllTypes.NestedEnum;
+import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/common/src/test/java/dev/cel/common/navigation/BUILD.bazel b/common/src/test/java/dev/cel/common/navigation/BUILD.bazel
index f269a0ce..d1219c9c 100644
--- a/common/src/test/java/dev/cel/common/navigation/BUILD.bazel
+++ b/common/src/test/java/dev/cel/common/navigation/BUILD.bazel
@@ -23,7 +23,7 @@ java_library(
         "//compiler:compiler_builder",
         "//parser:macro",
         "//parser:operator",
-        "@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
+        "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
diff --git a/common/src/test/java/dev/cel/common/navigation/CelNavigableExprVisitorTest.java b/common/src/test/java/dev/cel/common/navigation/CelNavigableExprVisitorTest.java
index a8a35dd6..2dddb515 100644
--- a/common/src/test/java/dev/cel/common/navigation/CelNavigableExprVisitorTest.java
+++ b/common/src/test/java/dev/cel/common/navigation/CelNavigableExprVisitorTest.java
@@ -20,7 +20,6 @@
 import static dev.cel.common.CelOverloadDecl.newMemberOverload;
 import static org.junit.Assert.assertThrows;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.UnsignedLong;
 import com.google.testing.junit.testparameterinjector.TestParameter;
@@ -37,6 +36,7 @@
 import dev.cel.common.types.StructTypeReference;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.parser.CelStandardMacro;
 import dev.cel.parser.Operator;
 import java.util.Optional;
@@ -580,7 +580,7 @@ public void messageConstruction_allNodesReturned() throws Exception {
     CelCompiler compiler =
         CelCompilerFactory.standardCelCompilerBuilder()
             .addMessageTypes(TestAllTypes.getDescriptor())
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .build();
     CelAbstractSyntaxTree ast = compiler.compile("TestAllTypes{single_int64: 1}").getAst();
     CelNavigableAst navigableAst = CelNavigableAst.fromAst(ast);
@@ -603,7 +603,7 @@ public void messageConstruction_filterStruct_allNodesReturned() throws Exception
     CelCompiler compiler =
         CelCompilerFactory.standardCelCompilerBuilder()
             .addMessageTypes(TestAllTypes.getDescriptor())
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .build();
     CelAbstractSyntaxTree ast = compiler.compile("TestAllTypes{single_int64: 1}").getAst();
     CelNavigableAst navigableAst = CelNavigableAst.fromAst(ast);
@@ -631,7 +631,7 @@ public void messageConstruction_preOrder_heightSet() throws Exception {
     CelCompiler compiler =
         CelCompilerFactory.standardCelCompilerBuilder()
             .addMessageTypes(TestAllTypes.getDescriptor())
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .build();
     CelAbstractSyntaxTree ast = compiler.compile("TestAllTypes{single_int64: 1}").getAst();
     CelNavigableAst navigableAst = CelNavigableAst.fromAst(ast);
@@ -651,7 +651,7 @@ public void messageConstruction_postOrder_heightSet() throws Exception {
     CelCompiler compiler =
         CelCompilerFactory.standardCelCompilerBuilder()
             .addMessageTypes(TestAllTypes.getDescriptor())
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .build();
     CelAbstractSyntaxTree ast = compiler.compile("TestAllTypes{single_int64: 1}").getAst();
     CelNavigableAst navigableAst = CelNavigableAst.fromAst(ast);
@@ -672,7 +672,7 @@ public void messageConstruction_maxIdsSet(@TestParameter TraversalOrder traversa
     CelCompiler compiler =
         CelCompilerFactory.standardCelCompilerBuilder()
             .addMessageTypes(TestAllTypes.getDescriptor())
-            .setContainer("google.api.expr.test.v1.proto3")
+            .setContainer("cel.expr.conformance.proto3")
             .build();
     CelAbstractSyntaxTree ast = compiler.compile("TestAllTypes{single_int64: 1}").getAst();
     CelNavigableAst navigableAst = CelNavigableAst.fromAst(ast);
diff --git a/extensions/src/test/java/dev/cel/extensions/BUILD.bazel b/extensions/src/test/java/dev/cel/extensions/BUILD.bazel
index c2d43599..03046796 100644
--- a/extensions/src/test/java/dev/cel/extensions/BUILD.bazel
+++ b/extensions/src/test/java/dev/cel/extensions/BUILD.bazel
@@ -26,8 +26,8 @@ java_library(
         "//runtime",
         "//runtime:interpreter_util",
         "@cel_spec//proto/cel/expr:expr_java_proto",
+        "@cel_spec//proto/cel/expr/conformance/proto3:test_all_types_java_proto",
         "@cel_spec//proto/test/v1/proto2:test_all_types_java_proto",
-        "@cel_spec//proto/test/v1/proto3:test_all_types_java_proto",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
diff --git a/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java
index 05caf800..a1ec3f6a 100644
--- a/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java
+++ b/extensions/src/test/java/dev/cel/extensions/CelBindingsExtensionsTest.java
@@ -17,7 +17,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.testing.junit.testparameterinjector.TestParameter;
@@ -31,6 +30,7 @@
 import dev.cel.common.types.StructTypeReference;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.parser.CelStandardMacro;
 import dev.cel.runtime.CelRuntime;
 import dev.cel.runtime.CelRuntime.CelFunctionBinding;
diff --git a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java
index c877555c..f3e0a533 100644
--- a/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java
+++ b/extensions/src/test/java/dev/cel/extensions/CelOptionalLibraryTest.java
@@ -18,8 +18,6 @@
 import static org.junit.Assert.assertThrows;
 
 import dev.cel.expr.Value;
-import com.google.api.expr.test.v1.proto2.TestAllTypesProto.TestAllTypes;
-import com.google.api.expr.test.v1.proto2.TestAllTypesProto.TestAllTypes.NestedMessage;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.primitives.UnsignedLong;
@@ -45,6 +43,8 @@
 import dev.cel.common.types.OptionalType;
 import dev.cel.common.types.SimpleType;
 import dev.cel.common.types.StructTypeReference;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
+import dev.cel.expr.conformance.proto3.TestAllTypes.NestedMessage;
 import dev.cel.parser.CelStandardMacro;
 import dev.cel.runtime.CelEvaluationException;
 import dev.cel.runtime.CelRuntime;
@@ -94,7 +94,7 @@ private static CelBuilder newCelBuilder() {
         .setOptions(
             CelOptions.current().enableUnsignedLongs(true).enableTimestampEpoch(true).build())
         .setStandardMacros(CelStandardMacro.STANDARD_MACROS)
-        .setContainer("google.api.expr.test.v1.proto2")
+        .setContainer("cel.expr.conformance.proto3")
         .addMessageTypes(TestAllTypes.getDescriptor())
         .addRuntimeLibraries(CelOptionalLibrary.INSTANCE)
         .addCompilerLibraries(CelOptionalLibrary.INSTANCE);
diff --git a/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java b/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java
index ef11ff65..7d6f9721 100644
--- a/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java
+++ b/extensions/src/test/java/dev/cel/extensions/CelSetsExtensionsTest.java
@@ -17,7 +17,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 
-import com.google.api.expr.test.v1.proto3.TestAllTypesProto.TestAllTypes;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
@@ -32,6 +31,7 @@
 import dev.cel.common.types.SimpleType;
 import dev.cel.compiler.CelCompiler;
 import dev.cel.compiler.CelCompilerFactory;
+import dev.cel.expr.conformance.proto3.TestAllTypes;
 import dev.cel.extensions.CelSetsExtensions.Function;
 import dev.cel.runtime.CelEvaluationException;
 import dev.cel.runtime.CelRuntime;
@@ -49,7 +49,7 @@ public final class CelSetsExtensionsTest {
       CelCompilerFactory.standardCelCompilerBuilder()
           .addMessageTypes(TestAllTypes.getDescriptor())
           .setOptions(CEL_OPTIONS)
-          .setContainer("google.api.expr.test.v1.proto3")
+          .setContainer("cel.expr.conformance.proto3")
           .addLibraries(CelExtensions.sets(CEL_OPTIONS))
           .addVar("list", ListType.create(SimpleType.INT))
           .addVar("subList", ListType.create(SimpleType.INT))