diff --git a/guava/Makefile b/guava/Makefile
index 2a4ffb42bc..1f700be6de 100644
--- a/guava/Makefile
+++ b/guava/Makefile
@@ -32,7 +32,7 @@ SOURCEPATH = $(SRC_DIR)
 INCLUDE_DIRS = $(GEN_OBJC_DIR)
 
 J2OBJCC := $(ARCH_BIN_DIR)/j2objcc -c -fobjc-abi-version=2 -fobjc-legacy-dispatch \
-  $(INCLUDE_DIRS:%=-I%)
+  $(INCLUDE_DIRS:%=-I%) -Wno-nullability -Wno-nonnull
 
 CREATE_JAR_NAME = j2objc_guava
 CREATE_JAR_SOURCES = $(JAVA_SOURCES)
diff --git a/make/static_framework.mk b/make/static_framework.mk
index 725e4868f3..fc29d23c47 100644
--- a/make/static_framework.mk
+++ b/make/static_framework.mk
@@ -116,6 +116,8 @@ $(FRAMEWORK_HEADER):
 	@echo "//\n// $(STATIC_FRAMEWORK_NAME).h\n//\n" > $@
 	@for f in $(STATIC_FRAMEWORK_PUBLIC_HEADERS:$(STATIC_HEADERS_DIR)/%=%); do\
 	    echo '#include <'$${f}'>'; done >> $@
+
+test_warnings: $(FRAMEWORK_HEADER)
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c -std=c11 $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c -std=c11 -fobjc-arc $@
 	@clang -c -o $(FRAMEWORK_HEADER:%.h=%.o) $(VERIFY_FLAGS) -x objective-c -std=c11 -fno-objc-arc $@