diff --git a/ChangeLog b/ChangeLog
index 769bb1a8eb..82e2901331 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-20  NotZed  <NotZed@HelixCode.com>
+
+	* tests/test11.c: Fixed some headers.
+
+	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
+	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
+	built).
+
 2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
 
 	* configure.in: Add Japanese to ALL_LINGUAS
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4f97b9e143..358cd3397d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,19 +25,19 @@ LDADD = \
 #	$(top_builddir)/filter/libfilter.la \
 #	$(top_builddir)/libibex/libibex.a
 
-test9_LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/camel/providers/mbox/libcamelmbox.la 	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+#test9_LDADD = \
+#	$(top_builddir)/camel/libcamel.la 	\
+#	$(top_builddir)/camel/providers/mbox/libcamelmbox.la 	\
+#	$(top_builddir)/libibex/libibex.la 	\
+#	$(GNOME_LIBDIR) 			\
+#	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
 
-test12_LDADD = \
-	$(top_builddir)/camel/libcamel.la 	\
-	$(top_builddir)/camel/providers/nntp/libcamelnntp.la 	\
-	$(top_builddir)/libibex/libibex.la 	\
-	$(GNOME_LIBDIR) 			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+#test12_LDADD = \
+#	$(top_builddir)/camel/libcamel.la 	\
+#	$(top_builddir)/camel/providers/nntp/libcamelnntp.la 	\
+#	$(top_builddir)/libibex/libibex.la 	\
+#	$(GNOME_LIBDIR) 			\
+#	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
 
 test_movemail_LDADD = \
 	$(top_builddir)/e-util/libeutil.la	\
@@ -58,12 +58,11 @@ noinst_PROGRAMS =  	\
 	test2		\
 	test3		\
 	test7		\
-	test9		\
 	test10		\
 	test11		\
-	test12		\
 	test-movemail	\
 	test-url	\
 	$(THREAD_RELATED_TESTS)
 
+#	test12		\
 #	test-formatter