diff --git a/ChangeLog b/ChangeLog
index c60fbf81d3..3f8b368dee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-29  Matthias Clasen <mclasen@redhat.com>
+
+	* tests/Makefile.am: Don't add testmountoperation to TEST_PROGS.
+
 2008-05-29  Tor Lillqvist  <tml@novell.com>
 
 	Bug 535526 - updateiconcache.c: using open/close without prototype
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a17e97194..00ec732823 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,9 +52,6 @@ TEST_PROGS                      += textbuffertest
 textbuffertest_DEPENDENCIES 	 = $(TEST_DEPS)
 textbuffertest_LDADD 		 = $(LDADDS)
 textbuffertest_SOURCES           = textbuffertest.c pixbuf-init.c
-if OS_UNIX
-TEST_PROGS                      += testmountoperation
-endif
 
 noinst_PROGRAMS =  $(TEST_PROGS)	\
 	simple				\
@@ -80,6 +77,7 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
 	testinput			\
 	testmenus			\
 	testmenubars			\
+	testmountoperation		\
 	testmultidisplay		\
 	testmultiscreen			\
 	testnotebookdnd			\