diff --git a/DEFS b/DEFS
index 277ad1da3..0248f1eb4 100644
--- a/DEFS
+++ b/DEFS
@@ -36,19 +36,18 @@ def create_genrules(
     name,
     srcs
     ):
-  if 'GENERATE_INFER_GENRULES' in os.environ and srcs:
-    for analyzer in analyzers:
-      analyzer_name = name + '_{}'.format(analyzer)
-      genrule(
-        name = analyzer_name,
-        srcs=srcs,
-        cmd = ' '.join([
+  for analyzer in analyzers:
+    analyzer_name = name + '_{}'.format(analyzer)
+    genrule(
+      name = analyzer_name,
+      srcs=srcs,
+      cmd = ' '.join([
           os.getenv('INFER_BIN', 'infer'),
           '-a', analyzer,
           '--results-dir', '$OUT',
           '--classpath', '$(classpath :{})'.format(name),
           '--sourcepath', '$SRCDIR',
           '--generated-classes', '$(location :{})'.format(name),
-        ]),
-        out = '{}_out'.format(analyzer),
-      )
+      ]),
+      out = '{}_out'.format(analyzer),
+    )
diff --git a/infer/tests/build_systems/genrule/Makefile b/infer/tests/build_systems/genrule/Makefile
index 2041d40e6..606043666 100644
--- a/infer/tests/build_systems/genrule/Makefile
+++ b/infer/tests/build_systems/genrule/Makefile
@@ -34,8 +34,7 @@ $(JSON_REPORT): $(JAVA_DEPS) $(JAVA_SOURCE_FILES) $(MAKEFILE_LIST)
 	$(QUIET)cd $(ROOT_DIR) && \
 	$(REMOVE_DIR) buck-out && \
 	$(call silent_on_success,Testing Buck genrule for Java integration,\
-	INFER_BIN="$(INFER_BIN)" NO_BUCKD=1 GENERATE_INFER_GENRULES=1 \
-	$(BUCK) build --no-cache $(INFER_TARGET))
+	INFER_BIN="$(INFER_BIN)" NO_BUCKD=1 $(BUCK) build --no-cache $(INFER_TARGET))
 	$(QUIET)touch $@
 
 infer-out/report.json: $(JSON_REPORT) $(MAKEFILE_LIST)