diff --git a/ChangeLog b/ChangeLog
index 9a91e33bc..335de6ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-23  Alexandre Duret-Lutz  <adl@src.lip6.fr>
+
+	* src/tgbatest/Makefile.am (check_PROGRAMS): Move ltl2tgba ...
+	(noinst_PROGRAMS): ... here.
+	* iface/gspn/Makefile.am (check_PROGRAMS): Rename as ...
+	(noinst_PROGRAMS): ... this.
+
 2004-04-22  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
 	* src/tgbatest/explicit.test: Reorder bdd variable in output.
diff --git a/iface/gspn/Makefile.am b/iface/gspn/Makefile.am
index 35d76dce6..47c5d704f 100644
--- a/iface/gspn/Makefile.am
+++ b/iface/gspn/Makefile.am
@@ -34,7 +34,7 @@ libspotgspn_la_SOURCES = \
   common.cc \
   gspn.cc
 
-check_PROGRAMS = \
+noinst_PROGRAMS = \
   dottygspn-rg \
   dottygspn-srg \
   ltlgspn-rg \
@@ -42,7 +42,7 @@ check_PROGRAMS = \
 
 if WITH_GSPN_SSP
 gspn_HEADERS += ssp.hh
-check_PROGRAMS += \
+noinst_PROGRAMS += \
   dottygspn-ssp \
   ltlgspn-ssp
 
diff --git a/src/tgbatest/Makefile.am b/src/tgbatest/Makefile.am
index c98d2b33c..c7fe8d34f 100644
--- a/src/tgbatest/Makefile.am
+++ b/src/tgbatest/Makefile.am
@@ -23,6 +23,10 @@ AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 LDADD = ../libspot.la
 
+# This is the most used test program, and it's also useful
+# to run manually outside the test suite.  Always build it.
+noinst_PROGRAMS = ltl2tgba
+
 check_SCRIPTS = defs
 # Keep this sorted alphabetically.
 check_PROGRAMS = \
@@ -30,7 +34,6 @@ check_PROGRAMS = \
   explicit \
   expldot \
   explprod \
-  ltl2tgba \
   ltlprod \
   mixprod \
   powerset \