diff --git a/config/kernel.m4 b/config/kernel.m4
index b61b842f36..d79ccc4d6d 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -255,7 +255,7 @@ AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [
 	rm -Rf build && mkdir -p build
 	echo "obj-m := conftest.o" >build/Makefile
 	AS_IF(
-		[AC_TRY_COMMAND(cp conftest.c build && make [$2] LINUXINCLUDE="-Iinclude -Iinclude2 -I$LINUX/include -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+		[AC_TRY_COMMAND(cp conftest.c build && make [$2] -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
 		[$4],
 		[_AC_MSG_LOG_CONFTEST m4_ifvaln([$5],[$5])]
 	)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 9da86d75b8..48c16c198a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -13,7 +13,6 @@ check:
 	@echo -n " ZTEST "
 	@echo    "===================================="
 	@echo
-	@$(shell ulimit -c unlimited)
 	@$(ZTEST) -V
 	@echo
 	@echo -n "===================================="