diff --git a/camel/ChangeLog b/camel/ChangeLog
index 144b7b7f52..c7a9da9176 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-20  JP Rosevear  <jpr@ximian.com>
+
+	* Pull up test fixes to get them building again
+
 2001-07-20  Not Zed  <NotZed@Ximian.com>
 
 	* camel-charset-map.c (camel_charset_get_iconv_friendly_name):
diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am
index f6dd852dd8..7ae6ef9a9d 100644
--- a/camel/tests/folder/Makefile.am
+++ b/camel/tests/folder/Makefile.am
@@ -10,7 +10,7 @@ LDADD = \
 	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
 
 check_PROGRAMS =  	\
 	test1	test4	test5	\
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
index 17ec182832..974c2c7793 100644
--- a/camel/tests/folder/test9.c
+++ b/camel/tests/folder/test9.c
@@ -165,7 +165,8 @@ int main(int argc, char **argv)
 	pull();
 
 	push("Building filters");
-	driver = camel_filter_driver_new(get_folder, NULL);
+	driver = camel_filter_driver_new();
+	camel_filter_driver_set_folder_func(driver, get_folder, NULL);
 	for (i=0;i<ARRAY_LEN(rules);i++) {
 		camel_filter_driver_add_rule(driver, rules[i].name, rules[i].match, rules[i].action);
 	}
@@ -185,7 +186,8 @@ int main(int argc, char **argv)
 	push("Testing broken match rules");
 	for (i=0;i<ARRAY_LEN(brokens);i++) {
 		push("rule %s", brokens[i].match);
-		driver = camel_filter_driver_new(get_folder, NULL);
+		driver = camel_filter_driver_new();
+		camel_filter_driver_set_folder_func(driver, get_folder, NULL);
 		camel_filter_driver_add_rule(driver, brokens[i].name, brokens[i].match, brokens[i].action);
 		camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", NULL, ex);
 		check(camel_exception_is_set(ex));
@@ -198,7 +200,8 @@ int main(int argc, char **argv)
 	push("Testing broken action rules");
 	for (i=0;i<ARRAY_LEN(brokena);i++) {
 		push("rule %s", brokena[i].action);
-		driver = camel_filter_driver_new(get_folder, NULL);
+		driver = camel_filter_driver_new();
+		camel_filter_driver_set_folder_func(driver, get_folder, NULL);
 		camel_filter_driver_add_rule(driver, brokena[i].name, brokena[i].match, brokena[i].action);
 		camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", NULL, ex);
 		check(camel_exception_is_set(ex));
diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am
index aa430fa409..2aa375d25e 100644
--- a/camel/tests/message/Makefile.am
+++ b/camel/tests/message/Makefile.am
@@ -10,7 +10,7 @@ LDADD = \
 	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
 
 check_PROGRAMS =  	\
 	test1		\
diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am
index 02faad7eb5..5d85ecd7df 100644
--- a/camel/tests/mime-filter/Makefile.am
+++ b/camel/tests/mime-filter/Makefile.am
@@ -11,7 +11,7 @@ LDADD = \
 	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
 
 EXTRA_DIST =			\
 	crlf-1.in		\
diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am
index 1cbcab8c26..1ebda3da9c 100644
--- a/camel/tests/misc/Makefile.am
+++ b/camel/tests/misc/Makefile.am
@@ -10,7 +10,7 @@ LDADD = \
 	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
 
 check_PROGRAMS =  	\
 	url
diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am
index 4f86852a7c..0eafc46e36 100644
--- a/camel/tests/smime/Makefile.am
+++ b/camel/tests/smime/Makefile.am
@@ -10,8 +10,7 @@ LDADD = \
 	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)			\
-	$(BONOBO_GNOME_LIBS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
 
 check_PROGRAMS =  	\
 	pgp		\
diff --git a/camel/tests/smime/pgp-mime.c b/camel/tests/smime/pgp-mime.c
index 2aba78232c..d2e243e084 100644
--- a/camel/tests/smime/pgp-mime.c
+++ b/camel/tests/smime/pgp-mime.c
@@ -109,7 +109,7 @@ int main (int argc, char **argv)
 	
 	session = camel_pgp_session_new ("/tmp/camel-test");
 	
-	ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg");
+	ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg", FALSE);
 	
 	camel_test_start ("Test of PGP/MIME functions");
 	
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index ad9a0fa753..2d5ff7228c 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -106,7 +106,7 @@ int main (int argc, char **argv)
 	
 	session = camel_pgp_session_new ("/tmp/camel-test");
 	
-	ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg");
+	ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg", FALSE);
 	
 	camel_test_start ("Test of PGP functions");
 	
diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am
index d16f8aaa55..1471ca82a5 100644
--- a/camel/tests/stream/Makefile.am
+++ b/camel/tests/stream/Makefile.am
@@ -10,7 +10,7 @@ LDADD = \
 	$(top_builddir)/libibex/libibex.la 	\
 	$(GNOME_LIBDIR) 			\
 	$(top_builddir)/camel/tests/lib/libcameltest.a			\
-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
+	$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
 
 check_PROGRAMS =  	\
 	test1 test2 test3