diff --git a/regression/Makefile b/regression/Makefile
index 243d65a460a..418a2501dde 100644
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -5,6 +5,7 @@ DIRS = ansi-c \
        cbmc-java-inheritance \
        cpp \
        goto-analyzer \
+       goto-analyzer-taint \
        goto-cc-cbmc \
        goto-cc-goto-analyzer \
        goto-diff \
diff --git a/regression/goto-analyzer-taint/Makefile b/regression/goto-analyzer-taint/Makefile
new file mode 100644
index 00000000000..ca7e7707afe
--- /dev/null
+++ b/regression/goto-analyzer-taint/Makefile
@@ -0,0 +1,25 @@
+default: tests.log
+
+test:
+	@if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \
+		../failed-tests-printer.pl ; \
+		exit 1 ; \
+	fi
+
+tests.log: ../test.pl
+	@if ! ../test.pl -c ../../../src/goto-analyzer/goto-analyzer ; then \
+		../failed-tests-printer.pl ; \
+		exit 1 ; \
+	fi
+
+show:
+	@for dir in *; do \
+		if [ -d "$$dir" ]; then \
+			vim -o "$$dir/*.java" "$$dir/*.out"; \
+		fi; \
+	done;
+
+clean:
+	find -name '*.out' -execdir $(RM) '{}' \;
+	find -name '*.gb' -execdir $(RM) '{}' \;
+	$(RM) tests.log
diff --git a/regression/goto-analyzer/taint-aliasing1/aliasing1.class b/regression/goto-analyzer-taint/taint-aliasing1/aliasing1.class
similarity index 100%
rename from regression/goto-analyzer/taint-aliasing1/aliasing1.class
rename to regression/goto-analyzer-taint/taint-aliasing1/aliasing1.class
diff --git a/regression/goto-analyzer/taint-aliasing1/aliasing1.java b/regression/goto-analyzer-taint/taint-aliasing1/aliasing1.java
similarity index 100%
rename from regression/goto-analyzer/taint-aliasing1/aliasing1.java
rename to regression/goto-analyzer-taint/taint-aliasing1/aliasing1.java
diff --git a/regression/goto-analyzer/taint-aliasing1/taint.json b/regression/goto-analyzer-taint/taint-aliasing1/taint.json
similarity index 100%
rename from regression/goto-analyzer/taint-aliasing1/taint.json
rename to regression/goto-analyzer-taint/taint-aliasing1/taint.json
diff --git a/regression/goto-analyzer/taint-aliasing1/test.desc b/regression/goto-analyzer-taint/taint-aliasing1/test.desc
similarity index 100%
rename from regression/goto-analyzer/taint-aliasing1/test.desc
rename to regression/goto-analyzer-taint/taint-aliasing1/test.desc
diff --git a/regression/goto-analyzer/taint-basic1/basic1.class b/regression/goto-analyzer-taint/taint-basic1/basic1.class
similarity index 100%
rename from regression/goto-analyzer/taint-basic1/basic1.class
rename to regression/goto-analyzer-taint/taint-basic1/basic1.class
diff --git a/regression/goto-analyzer/taint-basic1/basic1.java b/regression/goto-analyzer-taint/taint-basic1/basic1.java
similarity index 100%
rename from regression/goto-analyzer/taint-basic1/basic1.java
rename to regression/goto-analyzer-taint/taint-basic1/basic1.java
diff --git a/regression/goto-analyzer/taint-basic1/taint.json b/regression/goto-analyzer-taint/taint-basic1/taint.json
similarity index 100%
rename from regression/goto-analyzer/taint-basic1/taint.json
rename to regression/goto-analyzer-taint/taint-basic1/taint.json
diff --git a/regression/goto-analyzer/taint-basic1/test.desc b/regression/goto-analyzer-taint/taint-basic1/test.desc
similarity index 100%
rename from regression/goto-analyzer/taint-basic1/test.desc
rename to regression/goto-analyzer-taint/taint-basic1/test.desc
diff --git a/regression/goto-analyzer/taint-basic2/basic2.class b/regression/goto-analyzer-taint/taint-basic2/basic2.class
similarity index 100%
rename from regression/goto-analyzer/taint-basic2/basic2.class
rename to regression/goto-analyzer-taint/taint-basic2/basic2.class
diff --git a/regression/goto-analyzer/taint-basic2/basic2.java b/regression/goto-analyzer-taint/taint-basic2/basic2.java
similarity index 100%
rename from regression/goto-analyzer/taint-basic2/basic2.java
rename to regression/goto-analyzer-taint/taint-basic2/basic2.java
diff --git a/regression/goto-analyzer/taint-basic2/taint.json b/regression/goto-analyzer-taint/taint-basic2/taint.json
similarity index 100%
rename from regression/goto-analyzer/taint-basic2/taint.json
rename to regression/goto-analyzer-taint/taint-basic2/taint.json
diff --git a/regression/goto-analyzer/taint-basic2/test.desc b/regression/goto-analyzer-taint/taint-basic2/test.desc
similarity index 100%
rename from regression/goto-analyzer/taint-basic2/test.desc
rename to regression/goto-analyzer-taint/taint-basic2/test.desc
diff --git a/regression/goto-analyzer/taint-interface1/interface1.class b/regression/goto-analyzer-taint/taint-interface1/interface1.class
similarity index 100%
rename from regression/goto-analyzer/taint-interface1/interface1.class
rename to regression/goto-analyzer-taint/taint-interface1/interface1.class
diff --git a/regression/goto-analyzer/taint-interface1/interface1.java b/regression/goto-analyzer-taint/taint-interface1/interface1.java
similarity index 100%
rename from regression/goto-analyzer/taint-interface1/interface1.java
rename to regression/goto-analyzer-taint/taint-interface1/interface1.java
diff --git a/regression/goto-analyzer/taint-interface1/my_I.class b/regression/goto-analyzer-taint/taint-interface1/my_I.class
similarity index 100%
rename from regression/goto-analyzer/taint-interface1/my_I.class
rename to regression/goto-analyzer-taint/taint-interface1/my_I.class
diff --git a/regression/goto-analyzer/taint-interface1/some_class.class b/regression/goto-analyzer-taint/taint-interface1/some_class.class
similarity index 100%
rename from regression/goto-analyzer/taint-interface1/some_class.class
rename to regression/goto-analyzer-taint/taint-interface1/some_class.class
diff --git a/regression/goto-analyzer/taint-interface1/taint.json b/regression/goto-analyzer-taint/taint-interface1/taint.json
similarity index 100%
rename from regression/goto-analyzer/taint-interface1/taint.json
rename to regression/goto-analyzer-taint/taint-interface1/taint.json
diff --git a/regression/goto-analyzer/taint-interface1/test.desc b/regression/goto-analyzer-taint/taint-interface1/test.desc
similarity index 100%
rename from regression/goto-analyzer/taint-interface1/test.desc
rename to regression/goto-analyzer-taint/taint-interface1/test.desc
diff --git a/regression/goto-analyzer/taint-interproc1/interproc1.class b/regression/goto-analyzer-taint/taint-interproc1/interproc1.class
similarity index 100%
rename from regression/goto-analyzer/taint-interproc1/interproc1.class
rename to regression/goto-analyzer-taint/taint-interproc1/interproc1.class
diff --git a/regression/goto-analyzer/taint-interproc1/interproc1.java b/regression/goto-analyzer-taint/taint-interproc1/interproc1.java
similarity index 100%
rename from regression/goto-analyzer/taint-interproc1/interproc1.java
rename to regression/goto-analyzer-taint/taint-interproc1/interproc1.java
diff --git a/regression/goto-analyzer/taint-interproc1/taint.json b/regression/goto-analyzer-taint/taint-interproc1/taint.json
similarity index 100%
rename from regression/goto-analyzer/taint-interproc1/taint.json
rename to regression/goto-analyzer-taint/taint-interproc1/taint.json
diff --git a/regression/goto-analyzer/taint-interproc1/test.desc b/regression/goto-analyzer-taint/taint-interproc1/test.desc
similarity index 100%
rename from regression/goto-analyzer/taint-interproc1/test.desc
rename to regression/goto-analyzer-taint/taint-interproc1/test.desc
diff --git a/regression/goto-analyzer/taint-map1/map1.class b/regression/goto-analyzer-taint/taint-map1/map1.class
similarity index 100%
rename from regression/goto-analyzer/taint-map1/map1.class
rename to regression/goto-analyzer-taint/taint-map1/map1.class
diff --git a/regression/goto-analyzer/taint-map1/map1.java b/regression/goto-analyzer-taint/taint-map1/map1.java
similarity index 100%
rename from regression/goto-analyzer/taint-map1/map1.java
rename to regression/goto-analyzer-taint/taint-map1/map1.java
diff --git a/regression/goto-analyzer/taint-map1/taint.json b/regression/goto-analyzer-taint/taint-map1/taint.json
similarity index 100%
rename from regression/goto-analyzer/taint-map1/taint.json
rename to regression/goto-analyzer-taint/taint-map1/taint.json
diff --git a/regression/goto-analyzer/taint-map1/test.desc b/regression/goto-analyzer-taint/taint-map1/test.desc
similarity index 100%
rename from regression/goto-analyzer/taint-map1/test.desc
rename to regression/goto-analyzer-taint/taint-map1/test.desc