diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index ca3de1d1633a..407868779822 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -2952,13 +2952,13 @@ TEST_PACKAGES = \
 	fmt/check \
 	gob/check \
 	html/check \
-	http/check \
+	$(if $(GCCGO_RUN_ALL_TESTS),http/check) \
 	io/check \
 	json/check \
 	log/check \
 	math/check \
 	mime/check \
-	net/check \
+	$(if $(GCCGO_RUN_ALL_TESTS),net/check) \
 	netchan/check \
 	os/check \
 	patch/check \
@@ -2974,7 +2974,7 @@ TEST_PACKAGES = \
 	strconv/check \
 	strings/check \
 	sync/check \
-	syslog/check \
+	$(if $(GCCGO_RUN_ALL_TESTS),syslog/check) \
 	tabwriter/check \
 	template/check \
 	time/check \
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index edc40b4be2a6..46821bad8ad2 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -1818,13 +1818,13 @@ TEST_PACKAGES = \
 	fmt/check \
 	gob/check \
 	html/check \
-	http/check \
+	$(if $(GCCGO_RUN_ALL_TESTS),http/check) \
 	io/check \
 	json/check \
 	log/check \
 	math/check \
 	mime/check \
-	net/check \
+	$(if $(GCCGO_RUN_ALL_TESTS),net/check) \
 	netchan/check \
 	os/check \
 	patch/check \
@@ -1840,7 +1840,7 @@ TEST_PACKAGES = \
 	strconv/check \
 	strings/check \
 	sync/check \
-	syslog/check \
+	$(if $(GCCGO_RUN_ALL_TESTS),syslog/check) \
 	tabwriter/check \
 	template/check \
 	time/check \