diff --git a/ChangeLog b/ChangeLog
index d585a72a3..91e5fd24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-03  Darin Adler  <darin@bentspoon.com>
+
+	* Makefile.am: Turn on test subdirectory.
+	* test/test.c: (test_init), (test_label_new):
+	* test/test.h:
+	Build without using EelLabel.
+
+	* src/nautilus-sidebar-title.c: Remove unused header include.
+
 2002-01-03  Darin Adler  <darin@bentspoon.com>
 
 	* TODO: Updated.
@@ -8,7 +17,6 @@
 	* components/music/nautilus-music-view.c:
 	Don't include EelList.
 
-
 2002-01-03  Darin Adler  <darin@bentspoon.com>
 
 	* libnautilus-private/nautilus-icon-container.c:
diff --git a/Makefile.am b/Makefile.am
index cb55230c1..cf0b46f60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS =			\
 	libnautilus-private 	\
 	libnautilus-adapter	\
 	src 			\
+	test 			\
 	components		\
 	po 			\
 	data 			\
@@ -21,10 +22,6 @@ SUBDIRS =			\
 	docs			\
 	$(NULL)
 
-XXX = \
-	test 			\
-	$(NULL)
-
 EXTRA_DIST=					\
 	COPYING.LIB				\
 	COPYING-DOCS				\
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 86ed6938f..a43224d0e 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -34,7 +34,6 @@
 #include <bonobo/bonobo-property-bag-client.h>
 #include <eel/eel-background.h>
 #include <eel/eel-gdk-extensions.h>
-#include <eel/eel-gdk-font-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
diff --git a/test/test.c b/test/test.c
index f2e1d882a..63345070c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -11,20 +11,7 @@ test_init (int *argc,
 	gdk_rgb_init ();
 	gnome_vfs_init ();
 
-	eel_make_warnings_and_criticals_stop_in_debugger
-		(G_LOG_DOMAIN,
-		 "Bonobo",
-		 "Gdk",
-		 "GnomeUI",
-		 "GnomeVFS",
-		 "GnomeVFS-CORBA",
-		 "GnomeVFS-pthread",
-		 "Gtk",
-		 "Nautilus",
-		 "Nautilus-Authenticate",
-		 "Nautilus-Tree",
-		 "ORBit",
-		 NULL);
+	eel_make_warnings_and_criticals_stop_in_debugger ();
 }
 
 int
@@ -178,17 +165,7 @@ test_label_new (const char *text,
 		text = "Foo";
 	}
 	
-	if (with_background) {
-		label = eel_label_new_with_background (text);
-	} else {
-		label = eel_label_new (text);
-	}
-
-	if (num_sizes_larger < 0) {
-		eel_label_make_smaller (EEL_LABEL (label), ABS (num_sizes_larger));
-	} else if (num_sizes_larger > 0) {
-		eel_label_make_larger (EEL_LABEL (label), num_sizes_larger);
-	}
+	label = gtk_label_new (text);
 
 	return label;
 }
diff --git a/test/test.h b/test/test.h
index f94491de1..c3ccb4321 100644
--- a/test/test.h
+++ b/test/test.h
@@ -1,4 +1,3 @@
-
 #ifndef TEST_H
 #define TEST_H