diff --git a/configure.ac b/configure.ac
index 22c616a8..ca13269d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 dnl 02111-1307, USA.
 
-AC_REVISION([$Id: configure.ac,v 1.39 2003/09/13 06:25:36 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.40 2003/09/14 07:49:12 rocky Exp $])dnl
 AC_INIT(lib/cdio.c)
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libcdio, 0.64-cvs)
@@ -302,6 +302,13 @@ AC_CONFIG_FILES([ \
        test/check_common_fn \
        test/Makefile \
        ])
+
+AC_CONFIG_COMMANDS([default],[[
+# Make sure scripts are executable
+chmod +x test/check_nrg.sh
+chmod +x test/check_cue.sh
+]],[[]])
+
 AC_OUTPUT
 
 echo "Using CD-ROM drivers: $cd_drivers"
diff --git a/test/Makefile.am b/test/Makefile.am
index 04b083d5..90fefc10 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.7 2003/09/14 04:59:40 rocky Exp $
+#   $Id: Makefile.am,v 1.8 2003/09/14 07:49:12 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -44,7 +44,7 @@ check_DATA = vcd_demo.right \
 EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
 	check_common_fn check_cue.sh.in check_nrg.sh.in
 
-TESTS_ENVIRONMENT=$(SHELL)
-TESTS = testischar testiso9660 check_sizeof $(check_SCRIPTS) 
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS) 
+XFAIL_TESTS = testassert${EXEEXT}
 
 MOSTLYCLEANFILES = core.* *.dump