diff --git a/Makefile b/Makefile
index 226e88aaf..e07516d45 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 BUILD_SYSTEMS_TESTS = \
   assembly ck_analytics ck_imports clang_multiple_files clang_translation clang_unknown_ext \
   delete_results_dir fail_on_issue gradle javac linters make project_root_rel reactive \
-  utf8_in_procname utf8_in_pwd
+  utf8_in_procname utf8_in_pwd waf
 ifneq ($(ANT),no)
 BUILD_SYSTEMS_TESTS += ant
 endif
diff --git a/infer/tests/build_systems/build_integration_tests.py b/infer/tests/build_systems/build_integration_tests.py
index 95e59a70a..ce3bec9ad 100755
--- a/infer/tests/build_systems/build_integration_tests.py
+++ b/infer/tests/build_systems/build_integration_tests.py
@@ -306,13 +306,7 @@ def test(name,
     return True
 
 class BuildIntegrationTest(unittest.TestCase):
-
-    def test_waf_integration(self):
-        test('waf', 'waf',
-             os.path.join(CODETOANALYZE_DIR, 'make'),
-             [{'compile': ['./waf', 'build']}],
-             clean_commands=[['make', 'clean']])
-
+    pass
 
 if __name__ == '__main__':
     # hackish capturing of the arguments after '--'
diff --git a/infer/tests/build_systems/expected_outputs/waf_report.json b/infer/tests/build_systems/expected_outputs/waf_report.json
deleted file mode 100644
index b43a81460..000000000
--- a/infer/tests/build_systems/expected_outputs/waf_report.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-    "bug_type": "NULL_DEREFERENCE",
-    "file": "utf8_in_function_names.c",
-    "procedure": "test_\uc131\uacf5"
-  }
-]
\ No newline at end of file
diff --git a/infer/tests/build_systems/waf/Makefile b/infer/tests/build_systems/waf/Makefile
new file mode 100644
index 000000000..69294213f
--- /dev/null
+++ b/infer/tests/build_systems/waf/Makefile
@@ -0,0 +1,25 @@
+# Copyright (c) 2016 - present Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+CUR_DIR = $(shell pwd)
+TESTS_DIR = ../..
+
+ANALYZER = infer
+
+CLANG_OPTIONS = -c
+INFERPRINT_OPTIONS = --issues-tests
+
+SOURCES = $(wildcard ../codetoanalyze/make/*.c)
+
+include $(TESTS_DIR)/clang.make
+
+infer-out/report.json: $(CLANG_DEPS) $(SOURCES)
+	$(MAKE) -C ../codetoanalyze/make clean
+	cd ../codetoanalyze/make && \
+	$(call silent_on_success,\
+	  $(INFER_BIN) --check-duplicate-symbols --results-dir $(CUR_DIR)/$(@D) -a $(ANALYZER) -- \
+	    ./waf)
diff --git a/infer/tests/build_systems/waf/issues.exp b/infer/tests/build_systems/waf/issues.exp
new file mode 100644
index 000000000..b785ca3df
--- /dev/null
+++ b/infer/tests/build_systems/waf/issues.exp
@@ -0,0 +1 @@
+utf8_in_function_names.c, test_성공, 2, NULL_DEREFERENCE, [start of procedure test_성공()]