diff --git a/modules/etc/config.py b/modules/etc/config.py
index fb920482f5f..4b0b01b78ed 100644
--- a/modules/etc/config.py
+++ b/modules/etc/config.py
@@ -4,4 +4,8 @@ def can_build(platform):
 
 
 def configure(env):
-    pass
+    # Tools only, disabled for non-tools
+    # TODO: Find a cleaner way to achieve that
+    if (env["tools"] == "no"):
+        env["module_etc_enabled"] = "no"
+        env.disabled_modules.append("etc")
diff --git a/modules/tinyexr/config.py b/modules/tinyexr/config.py
index fb920482f5f..2e4b96a6b09 100644
--- a/modules/tinyexr/config.py
+++ b/modules/tinyexr/config.py
@@ -4,4 +4,8 @@ def can_build(platform):
 
 
 def configure(env):
-    pass
+    # Tools only, disabled for non-tools
+    # TODO: Find a cleaner way to achieve that
+    if (env["tools"] == "no"):
+        env["module_tinyexr_enabled"] = "no"
+        env.disabled_modules.append("tinyexr")