diff --git a/ChangeLog b/ChangeLog
index 83ed7cdb..df8557b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1999-03-10  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* tests/Makefile.am (TESTS): run demo-nofast before demo-shared
+
 	* configure.in: create ltconfig and ltmain.sh at the end of
 	config.status, if they do not exist.  This fixes the bootstrap
 	problem reported by Erez Zadok <ezk@cs.columbia.edu>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 548a7b01..839bf871 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,15 +12,14 @@ TESTS = demo-static.test demo-make.test demo-exec.test \
 	mdemo-conf.test mdemo-make.test mdemo-exec.test \
 	mdemo-inst.test mdemo-unst.test \
 	cdemo-conf.test cdemo-make.test cdemo-exec.test \
-	demo-shared.test demo-make.test demo-exec.test \
-	demo-inst.test \
+	demo-nofast.test demo-make.test demo-exec.test \
+	demo-inst.test demo-unst.test \
+	demo-shared.test demo-make.test demo-exec.test demo-inst.test \
 	hardcode.test build-relink.test \
 	demo-unst.test \
 	mdemo-shared.test mdemo-make.test mdemo-exec.test \
 	mdemo-inst.test mdemo-unst.test \
 	cdemo-shared.test cdemo-make.test cdemo-exec.test \
-	demo-nofast.test demo-make.test demo-exec.test \
-	demo-inst.test demo-unst.test \
 	link.test link-2.test nomode.test \
 	quote.test sh.test suffix.test