diff --git a/configure b/configure
index 5c038d6..bced961 100755
--- a/configure
+++ b/configure
@@ -9,6 +9,7 @@ if [ -z "$PREFIX" ]; then
    PREFIX=/usr/local
 fi
 
+BASH=$(command -v bash)
 GUILE=$(command -v guile)
 GUILE_TOOLS=$(command -v guile-tools)
 GUILE_SITE_DIR=$PREFIX/share/guile/site/$GUILE_EFFECTIVE_VERSION
@@ -22,6 +23,7 @@ sed \
     bin/gash.in > bin/gash
 chmod +x bin/gash
 cat > .config.make <<EOF
+BASH=$BASH
 GUILE=$GUILE
 GUILE_TOOLS=$GUILE_TOOLS
 PREFIX=$PREFIX
diff --git a/makefile b/makefile
index 16df70f..e0cfad9 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-.PHONY: all all-go clean install
+.PHONY: all all-go check clean install
 -include .config.make
 
 default: all
@@ -20,8 +20,15 @@ clean:
 clean-go:
 	rm -f $(shell find . -name '*.go')
 
-check: all
-	echo TODO
+check: all check-bash check-gash
+
+check-bash: all
+ifneq ($(BASH),)
+	SHELL=$(BASH) ./test.sh
+endif
+
+check-gash: all
+	./test.sh
 
 install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -40,6 +47,7 @@ Usage: make [OPTION]... [TARGET]...
 Targets:
   all             update everything
   all-go          update .go files
+  check           run ./test.sh
   clean           run git clean -dfx
   clean-go        clean .go files
   install         install in $(PREFIX)
@@ -48,8 +56,10 @@ export HELP_TOP
 help:
 	@echo "$$HELP_TOP"
 
+export BUILD_DEBUG
 export GUILE
 export GUILE_TOOLS
 export GUILE_LOAD_PATH
 export GUILE_LOAD_COMPILED_PATH
 
+
diff --git a/test.sh b/test.sh
index 60db800..427abb0 100755
--- a/test.sh
+++ b/test.sh
@@ -1 +1,17 @@
-for f in test/*; do echo $f ":"; bin/gash $f; echo; done
+if [ -n "$BUILD_DEBUG" ]; then
+    set -x
+fi
+SHELL=${SHELL-bin/gash}
+for f in test/*.sh; do
+    echo -n "$f: "
+    b=test/$(basename $f .sh)
+    $SHELL $f
+    r=$?
+    if [ -f $b.exit ]; then
+        e=$(cat $b.exit)
+    else
+        e=0
+    fi
+    [ $r = $e ] || exit 1
+    echo pass
+done
diff --git a/test/00-exit.sh b/test/00-exit.sh
new file mode 100644
index 0000000..ae3bc0a
--- /dev/null
+++ b/test/00-exit.sh
@@ -0,0 +1 @@
+exit
\ No newline at end of file
diff --git a/test/01-exit-0.sh b/test/01-exit-0.sh
new file mode 100644
index 0000000..eec2061
--- /dev/null
+++ b/test/01-exit-0.sh
@@ -0,0 +1 @@
+exit 0
\ No newline at end of file
diff --git a/test/02-exit-1.exit b/test/02-exit-1.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/02-exit-1.exit
@@ -0,0 +1 @@
+1
diff --git a/test/02-exit-1.sh b/test/02-exit-1.sh
new file mode 100644
index 0000000..6dedc57
--- /dev/null
+++ b/test/02-exit-1.sh
@@ -0,0 +1 @@
+exit 1
\ No newline at end of file
diff --git a/test/03-echo.sh b/test/03-echo.sh
new file mode 100644
index 0000000..dccbe8e
--- /dev/null
+++ b/test/03-echo.sh
@@ -0,0 +1 @@
+echo
\ No newline at end of file
diff --git a/test/04-echo-var.sh b/test/04-echo-var.sh
new file mode 100644
index 0000000..e93c00f
--- /dev/null
+++ b/test/04-echo-var.sh
@@ -0,0 +1 @@
+echo $SHELL
\ No newline at end of file
diff --git a/test/assignment b/test/05-assignment.sh
similarity index 100%
rename from test/assignment
rename to test/05-assignment.sh
diff --git a/test/06-assignment-echo.sh b/test/06-assignment-echo.sh
new file mode 100644
index 0000000..eef32cd
--- /dev/null
+++ b/test/06-assignment-echo.sh
@@ -0,0 +1,2 @@
+SHELL=/bin/bash
+echo $SHELL
diff --git a/test/find b/test/find.sh
similarity index 100%
rename from test/find
rename to test/find.sh
diff --git a/test/for b/test/for
deleted file mode 100644
index 8760e30..0000000
--- a/test/for
+++ /dev/null
@@ -1 +0,0 @@
-for f in *; do echo "$f:" | grep c; done
diff --git a/test/for.sh b/test/for.sh
new file mode 100644
index 0000000..5789d8d
--- /dev/null
+++ b/test/for.sh
@@ -0,0 +1 @@
+for f in test/*.sh; do echo "$f:" | grep '.sh' ; done
diff --git a/test/ifthen b/test/ifthen.sh
similarity index 100%
rename from test/ifthen
rename to test/ifthen.sh
diff --git a/test/ifthenelse b/test/ifthenelse.sh
similarity index 100%
rename from test/ifthenelse
rename to test/ifthenelse.sh
diff --git a/test/iohere b/test/iohere.sh
similarity index 100%
rename from test/iohere
rename to test/iohere.sh
diff --git a/test/list b/test/list.sh
similarity index 100%
rename from test/list
rename to test/list.sh
diff --git a/test/ls b/test/ls.sh
similarity index 100%
rename from test/ls
rename to test/ls.sh
diff --git a/test/nesting b/test/nesting.sh
similarity index 100%
rename from test/nesting
rename to test/nesting.sh
diff --git a/test/pipe b/test/pipe.sh
similarity index 100%
rename from test/pipe
rename to test/pipe.sh
diff --git a/test/substitution b/test/substitution.sh
similarity index 100%
rename from test/substitution
rename to test/substitution.sh
diff --git a/test/test b/test/test.sh
similarity index 100%
rename from test/test
rename to test/test.sh
diff --git a/test/var b/test/var
deleted file mode 100644
index 6cfa9fa..0000000
--- a/test/var
+++ /dev/null
@@ -1 +0,0 @@
-echo $SHELL