diff --git a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt
index 2bfa71fa77d..73e373d6eb1 100644
--- a/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt
+++ b/firebase-dataconnect/connectors/src/androidTest/kotlin/com/google/firebase/dataconnect/connectors/demo/EnumIntegrationTest.kt
@@ -429,18 +429,13 @@ class EnumIntegrationTest : DemoConnectorIntegrationTestBase() {
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
   @Test
-  @Ignore(
-    "TODO(b/432793533) Re-enable this test once the emulator crash " +
-      "caused by the \"EnumKey_GetByKey\" query is fixed."
-  )
   fun enumAsPrimaryKey() = runTest {
     N5ekmae3jn.entries.forEach { enumValue ->
       val tagValue = Arb.dataConnect.tag().next(rs)
       val key = connector.enumKeyInsert.execute(enumValue) { tag = tagValue }.data.key
-      withClue(key) { key.enumValue shouldBe Known(enumValue) }
-      // TODO(b/432793533): Uncomment once the "EnumKey_GetByKey" query is uncommented.
-      // val queryResult = connector.enumKeyGetByKey.execute(key).data
-      // withClue(queryResult) { queryResult.item?.tag shouldBe tagValue }
+      withClue(key) { key.enumValue shouldBe enumValue }
+      val queryResult = connector.enumKeyGetByKey.execute(key).data
+      withClue(queryResult) { queryResult.item?.tag shouldBe tagValue }
     }
   }
 
diff --git a/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql b/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql
index 231a0991214..57ce2f4abaa 100644
--- a/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql
+++ b/firebase-dataconnect/emulator/dataconnect/connector/demo/demo_ops.gql
@@ -1778,10 +1778,9 @@ mutation EnumKey_Insert($enumValue: N5ekmae3jn!, $tag: String) @auth(level: PUBL
   key: enumKey_insert(data: { enumValue: $enumValue, tag: $tag })
 }
 
-# TODO(b/432793533) Uncomment once the emulator crash caused by this query is fixed.
-#query EnumKey_GetByKey($key: EnumKey_Key!) @auth(level: PUBLIC) {
-#  item: enumKey(key: $key) { tag }
-#}
+query EnumKey_GetByKey($key: EnumKey_Key!) @auth(level: PUBLIC) {
+  item: enumKey(key: $key) { tag }
+}
 
 ###############################################################################
 # Operations for table: type MultipleEnumColumns
diff --git a/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/EnumIntegrationTest.kt b/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/EnumIntegrationTest.kt
index fcda65ec57d..31ffa642033 100644
--- a/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/EnumIntegrationTest.kt
+++ b/firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/EnumIntegrationTest.kt
@@ -35,7 +35,6 @@ import io.kotest.property.checkAll
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.serializer
-import org.junit.Ignore
 import org.junit.Test
 
 class EnumIntegrationTest : DataConnectIntegrationTestBase() {
@@ -605,10 +604,6 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
   //////////////////////////////////////////////////////////////////////////////////////////////////
 
   @Test
-  @Ignore(
-    "TODO(b/432793533) Re-enable this test once the emulator crash " +
-      "caused by the \"EnumKey_GetByKey\" query is fixed."
-  )
   fun enumAsPrimaryKey() = runTest {
     N5ekmae3jn.entries.forEach { enumValue ->
       val tag = Arb.dataConnect.tag().next(rs)