diff --git a/src/test/java/eu/europa/ted/efx/mock/sdk2/SymbolResolverMockV2.java b/src/test/java/eu/europa/ted/efx/mock/sdk2/SymbolResolverMockV2.java
index 99eb757..632a9e0 100644
--- a/src/test/java/eu/europa/ted/efx/mock/sdk2/SymbolResolverMockV2.java
+++ b/src/test/java/eu/europa/ted/efx/mock/sdk2/SymbolResolverMockV2.java
@@ -71,7 +71,8 @@ private Map<String, SdkCodelist> createMockCodelists() {
         buildCodelistMock("accessibility", Optional.empty()),
         buildCodelistMock("authority-activity", Optional.of("main-activity")),
         buildCodelistMock("main-activity", Optional.empty()),
-        buildCodelistMock("legal-basis-1", Optional.empty())));
+        buildCodelistMock("legal-basis-1", Optional.empty()),
+        buildCodelistMock("indicator", Optional.empty())));
   }
 
   @Override
diff --git a/src/test/java/eu/europa/ted/efx/sdk2/EfxExpressionTranslatorV2Test.java b/src/test/java/eu/europa/ted/efx/sdk2/EfxExpressionTranslatorV2Test.java
index 6528cc5..3a6acc4 100644
--- a/src/test/java/eu/europa/ted/efx/sdk2/EfxExpressionTranslatorV2Test.java
+++ b/src/test/java/eu/europa/ted/efx/sdk2/EfxExpressionTranslatorV2Test.java
@@ -1138,6 +1138,12 @@ void testCodeList_WithNumericSuffix() {
         "'a' in #legal-basis-1");
   }
 
+  @Test
+  void testCodeList_WithKeywordName() {
+    testExpressionTranslationWithContext("'a' = ('code1','code2','code3')", "BT-00-Text",
+        "'a' in #indicator");
+  }
+
   // #endregion: Lists
 
   // #region: References ------------------------------------------------------