diff --git a/Makefile.am b/Makefile.am
index ae0fc53..d79d44e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = doc src contrib
+SUBDIRS = doc src contrib tests
 
 EXTRA_DIST = INSTALL.gnu packages
 
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..6a363ed
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+aclocal
+autoheader
+autoconf
+automake --add-missing
+
diff --git a/configure.in b/configure.in
index 323f119..3fad0b1 100644
--- a/configure.in
+++ b/configure.in
@@ -415,5 +415,5 @@ case "$host_os" in
 	;;
 esac
 
-AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile contrib/Makefile])
+AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile contrib/Makefile tests/Makefile])
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..2278a71
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,7 @@
+check_SCRIPTS = check0.sh check1.sh check2.sh \
+		check3.sh check4.sh check6.sh \
+		check7.sh check8.sh check9.sh
+
+TESTS = check0.sh check1.sh check2.sh \
+	check3.sh check4.sh check6.sh \
+	check7.sh check8.sh check9.sh 
diff --git a/tests/check0.sh b/tests/check0.sh
new file mode 100755
index 0000000..2487107
--- /dev/null
+++ b/tests/check0.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+EXPECT=4
+SINDEX=0
+STERM=main
+STYPE="find C symbol"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#Count the number of instances of the string 'Copyright'
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check1.sh b/tests/check1.sh
new file mode 100755
index 0000000..a80997b
--- /dev/null
+++ b/tests/check1.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+EXPECT=3
+SINDEX=1
+STERM=main
+STYPE="symbol definition"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#Count the number of instances of the string 'Copyright'
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check2.sh b/tests/check2.sh
new file mode 100755
index 0000000..efbf2e5
--- /dev/null
+++ b/tests/check2.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+EXPECT=96
+SINDEX=2
+STERM=build
+STYPE="functions called by"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check3.sh b/tests/check3.sh
new file mode 100755
index 0000000..5ec8fc0
--- /dev/null
+++ b/tests/check3.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+EXPECT=44
+SINDEX=3
+STERM=printf
+STYPE="functions calling"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check4.sh b/tests/check4.sh
new file mode 100755
index 0000000..5a58d59
--- /dev/null
+++ b/tests/check4.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+EXPECT=3
+SINDEX=4
+STERM=oldsigquit
+STYPE="regular text string"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check6.sh b/tests/check6.sh
new file mode 100755
index 0000000..b13b33e
--- /dev/null
+++ b/tests/check6.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+EXPECT=1
+SINDEX=6
+STERM=msg.*what
+STYPE="egrep string"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#Count the number of instances of the string 'Copyright'
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check7.sh b/tests/check7.sh
new file mode 100755
index 0000000..3dc0706
--- /dev/null
+++ b/tests/check7.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+EXPECT=1
+SINDEX=7
+STERM=main.c
+STYPE="file named"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#Count the number of instances of the string 'Copyright'
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check8.sh b/tests/check8.sh
new file mode 100755
index 0000000..d03a73a
--- /dev/null
+++ b/tests/check8.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+EXPECT=9
+SINDEX=8
+STERM=unistd.h
+STYPE="files including this file"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#Count the number of instances of the string 'Copyright'
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+
diff --git a/tests/check9.sh b/tests/check9.sh
new file mode 100755
index 0000000..87f59f3
--- /dev/null
+++ b/tests/check9.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+EXPECT=2
+SINDEX=9
+STERM=reftime
+STYPE="assignments to symbol"
+
+echo "Searching item $SINDEX, '$STYPE'"
+
+#Get to the top level directory
+cd ..
+
+#Remove any previous databases from testing
+rm -f cscope.out
+
+#Count the number of instances of the string 'Copyright'
+#We expect 178 currently
+COUNT=$(./src/cscope -R -L -$SINDEX$STERM | wc -l)
+
+if [ $COUNT -ne $EXPECT ]
+then
+	echo "Expected $EXPECT instances of $STYPE $STERM but found $COUNT"
+	exit 1
+fi
+
+exit 0
+