diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
index 46fc817..581ef99 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
@@ -100,14 +100,14 @@
     for (ProjectState parentState : projectState.treeInOrder()) {
       PluginConfig parentCfg =
           pluginCfgFactory.getFromProjectConfig(parentState, pluginName);
-      if ("enforced".equals(parentCfg.getString("enabled"))
+      if (!"false".equals(parentCfg.getString("enabled"))
           && isEnabledForBranch(parentState, refName)) {
         return true;
       }
     }
 
-    return pluginCfgFactory.getFromProjectConfigWithInheritance(
-        projectState, pluginName).getBoolean("enabled", false)
+    return !"false".equals(pluginCfgFactory.getFromProjectConfigWithInheritance(
+        projectState, pluginName).getString("enabled", "false"))
         && isEnabledForBranch(projectState, refName);
   }
 
