diff --git a/unittest/Fixed.sh b/testsuite/Fixed.sh
similarity index 100%
rename from unittest/Fixed.sh
rename to testsuite/Fixed.sh
diff --git a/testsuite/Makefile b/testsuite/Makefile
new file mode 100644
index 00000000..f274dcca
--- /dev/null
+++ b/testsuite/Makefile
@@ -0,0 +1,27 @@
+testsuite: ../src/parallel tests-to-run/* wanted-results/*
+	echo | mop || (echo mop is required for testsuite; /bin/false)
+	seq 1 2 | mop || (echo seq is required for testsuite; /bin/false)
+	stdout echo || (echo stdout is required for testsuite; /bin/false)
+	convert | mop || (echo convert is required for testsuite; /bin/false)
+	ren 2>&1 | mop || (echo ren is required for testsuite; /bin/false)
+	echo | buffer | mop || (echo buffer is required for testsuite; /bin/false)
+	echo 1+2 | bc | mop || (echo bc is required for testsuite; /bin/false)
+	stdout gawk | mop || (echo gawk is required for testsuite; /bin/false)
+	expect -c 'spawn cat; puts "expect is installed"' || (echo expect is required for testsuite; /bin/false)
+	echo | pv -qL 10 || (echo pv is required for testsuite; /bin/false)
+	echo | script -c echo -q /dev/null || (echo script is required for testsuite; /bin/false)
+	niceload true || (echo niceload is required for testsuite; /bin/false)
+	time sh Start.sh
+	date
+
+clean:
+	rm -rf input-files/random_dirs_no_newline
+	rm -rf input-files/random_dirs_with_newline
+
+dist:
+	rm -rf input-files/random_dirs_*_newline || /bin/true
+	rm -rf tmp || /bin/true
+	( cd ..; tar -cvj --exclude .git --exclude '#*#' --exclude '*~' --exclude CVS -f /tmp/parallel.tar.bz2 parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
+	mv /tmp/parallel.tar.bz2 parallel-$$(date +"%Y%m%d").tar.bz2
+	rsync -Havessh parallel-$$(date +"%Y%m%d").tar.bz2 download.savannah.nongnu.org:/releases/parallel/
+
diff --git a/unittest/Start.sh b/testsuite/Start.sh
similarity index 100%
rename from unittest/Start.sh
rename to testsuite/Start.sh
diff --git a/unittest/input-files/random_dirs_no_newline.tar.bz2 b/testsuite/input-files/random_dirs_no_newline.tar.bz2
similarity index 100%
rename from unittest/input-files/random_dirs_no_newline.tar.bz2
rename to testsuite/input-files/random_dirs_no_newline.tar.bz2
diff --git a/unittest/input-files/random_dirs_with_newline.tar.bz2 b/testsuite/input-files/random_dirs_with_newline.tar.bz2
similarity index 100%
rename from unittest/input-files/random_dirs_with_newline.tar.bz2
rename to testsuite/input-files/random_dirs_with_newline.tar.bz2
diff --git a/unittest/input-files/segfault/items-0.xi b/testsuite/input-files/segfault/items-0.xi
similarity index 100%
rename from unittest/input-files/segfault/items-0.xi
rename to testsuite/input-files/segfault/items-0.xi
diff --git a/unittest/input-files/segfault/trysegfault b/testsuite/input-files/segfault/trysegfault
similarity index 100%
rename from unittest/input-files/segfault/trysegfault
rename to testsuite/input-files/segfault/trysegfault
diff --git a/unittest/input-files/test08/a b/testsuite/input-files/test08/a
similarity index 100%
rename from unittest/input-files/test08/a
rename to testsuite/input-files/test08/a
diff --git a/unittest/input-files/test08/b b/testsuite/input-files/test08/b
similarity index 100%
rename from unittest/input-files/test08/b
rename to testsuite/input-files/test08/b
diff --git a/unittest/input-files/test08/c b/testsuite/input-files/test08/c
similarity index 100%
rename from unittest/input-files/test08/c
rename to testsuite/input-files/test08/c
diff --git a/unittest/input-files/test08/d b/testsuite/input-files/test08/d
similarity index 100%
rename from unittest/input-files/test08/d
rename to testsuite/input-files/test08/d
diff --git a/unittest/input-files/test15/1 b/testsuite/input-files/test15/1
similarity index 100%
rename from unittest/input-files/test15/1
rename to testsuite/input-files/test15/1
diff --git a/unittest/input-files/test15/2 b/testsuite/input-files/test15/2
similarity index 100%
rename from unittest/input-files/test15/2
rename to testsuite/input-files/test15/2
diff --git a/unittest/input-files/test15/3 b/testsuite/input-files/test15/3
similarity index 100%
rename from unittest/input-files/test15/3
rename to testsuite/input-files/test15/3
diff --git a/unittest/input-files/test15/files b/testsuite/input-files/test15/files
similarity index 100%
rename from unittest/input-files/test15/files
rename to testsuite/input-files/test15/files
diff --git a/unittest/input-files/testdir/1-col.txt b/testsuite/input-files/testdir/1-col.txt
similarity index 100%
rename from unittest/input-files/testdir/1-col.txt
rename to testsuite/input-files/testdir/1-col.txt
diff --git a/unittest/input-files/testdir/2-col.txt b/testsuite/input-files/testdir/2-col.txt
similarity index 100%
rename from unittest/input-files/testdir/2-col.txt
rename to testsuite/input-files/testdir/2-col.txt
diff --git a/unittest/input-files/testdir/a/bar b/testsuite/input-files/testdir/a/bar
similarity index 100%
rename from unittest/input-files/testdir/a/bar
rename to testsuite/input-files/testdir/a/bar
diff --git a/unittest/input-files/testdir/a/foo b/testsuite/input-files/testdir/a/foo
similarity index 100%
rename from unittest/input-files/testdir/a/foo
rename to testsuite/input-files/testdir/a/foo
diff --git a/unittest/input-files/testdir/a/foo2 b/testsuite/input-files/testdir/a/foo2
similarity index 100%
rename from unittest/input-files/testdir/a/foo2
rename to testsuite/input-files/testdir/a/foo2
diff --git a/unittest/input-files/testdir/b/bar b/testsuite/input-files/testdir/b/bar
similarity index 100%
rename from unittest/input-files/testdir/b/bar
rename to testsuite/input-files/testdir/b/bar
diff --git a/unittest/input-files/testdir/b/foo b/testsuite/input-files/testdir/b/foo
similarity index 100%
rename from unittest/input-files/testdir/b/foo
rename to testsuite/input-files/testdir/b/foo
diff --git a/unittest/input-files/testdir2/1-col.txt b/testsuite/input-files/testdir2/1-col.txt
similarity index 100%
rename from unittest/input-files/testdir2/1-col.txt
rename to testsuite/input-files/testdir2/1-col.txt
diff --git a/unittest/input-files/testdir2/2-col.txt b/testsuite/input-files/testdir2/2-col.txt
similarity index 100%
rename from unittest/input-files/testdir2/2-col.txt
rename to testsuite/input-files/testdir2/2-col.txt
diff --git a/unittest/input-files/testdir2/a/bar b/testsuite/input-files/testdir2/a/bar
similarity index 100%
rename from unittest/input-files/testdir2/a/bar
rename to testsuite/input-files/testdir2/a/bar
diff --git a/unittest/input-files/testdir2/a/foo b/testsuite/input-files/testdir2/a/foo
similarity index 100%
rename from unittest/input-files/testdir2/a/foo
rename to testsuite/input-files/testdir2/a/foo
diff --git a/unittest/input-files/testdir2/a/foo2 b/testsuite/input-files/testdir2/a/foo2
similarity index 100%
rename from unittest/input-files/testdir2/a/foo2
rename to testsuite/input-files/testdir2/a/foo2
diff --git a/unittest/input-files/testdir2/b/bar b/testsuite/input-files/testdir2/b/bar
similarity index 100%
rename from unittest/input-files/testdir2/b/bar
rename to testsuite/input-files/testdir2/b/bar
diff --git a/unittest/input-files/testdir2/b/foo b/testsuite/input-files/testdir2/b/foo
similarity index 100%
rename from unittest/input-files/testdir2/b/foo
rename to testsuite/input-files/testdir2/b/foo
diff --git a/unittest/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg b/testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg
similarity index 100%
rename from unittest/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg
rename to testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg
diff --git a/unittest/input-files/testdir3.tar.bz2 b/testsuite/input-files/testdir3.tar.bz2
similarity index 100%
rename from unittest/input-files/testdir3.tar.bz2
rename to testsuite/input-files/testdir3.tar.bz2
diff --git a/unittest/input-files/xargs-inputs/16383-ys.xi b/testsuite/input-files/xargs-inputs/16383-ys.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/16383-ys.xi
rename to testsuite/input-files/xargs-inputs/16383-ys.xi
diff --git a/unittest/input-files/xargs-inputs/32767-ys.xi b/testsuite/input-files/xargs-inputs/32767-ys.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/32767-ys.xi
rename to testsuite/input-files/xargs-inputs/32767-ys.xi
diff --git a/unittest/input-files/xargs-inputs/EOF.xi b/testsuite/input-files/xargs-inputs/EOF.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/EOF.xi
rename to testsuite/input-files/xargs-inputs/EOF.xi
diff --git a/unittest/input-files/xargs-inputs/EOFb.xi b/testsuite/input-files/xargs-inputs/EOFb.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/EOFb.xi
rename to testsuite/input-files/xargs-inputs/EOFb.xi
diff --git a/unittest/input-files/xargs-inputs/EOFe.xi b/testsuite/input-files/xargs-inputs/EOFe.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/EOFe.xi
rename to testsuite/input-files/xargs-inputs/EOFe.xi
diff --git a/unittest/input-files/xargs-inputs/Pdata.xi b/testsuite/input-files/xargs-inputs/Pdata.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/Pdata.xi
rename to testsuite/input-files/xargs-inputs/Pdata.xi
diff --git a/unittest/input-files/xargs-inputs/blank.xi b/testsuite/input-files/xargs-inputs/blank.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/blank.xi
rename to testsuite/input-files/xargs-inputs/blank.xi
diff --git a/unittest/input-files/xargs-inputs/empty.xi b/testsuite/input-files/xargs-inputs/empty.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/empty.xi
rename to testsuite/input-files/xargs-inputs/empty.xi
diff --git a/unittest/input-files/xargs-inputs/eof1.xi b/testsuite/input-files/xargs-inputs/eof1.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/eof1.xi
rename to testsuite/input-files/xargs-inputs/eof1.xi
diff --git a/unittest/input-files/xargs-inputs/eof_-0.xi b/testsuite/input-files/xargs-inputs/eof_-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/eof_-0.xi
rename to testsuite/input-files/xargs-inputs/eof_-0.xi
diff --git a/unittest/input-files/xargs-inputs/eof_.xi b/testsuite/input-files/xargs-inputs/eof_.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/eof_.xi
rename to testsuite/input-files/xargs-inputs/eof_.xi
diff --git a/unittest/input-files/xargs-inputs/eofstr.xi b/testsuite/input-files/xargs-inputs/eofstr.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/eofstr.xi
rename to testsuite/input-files/xargs-inputs/eofstr.xi
diff --git a/unittest/input-files/xargs-inputs/ett.xi b/testsuite/input-files/xargs-inputs/ett.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/ett.xi
rename to testsuite/input-files/xargs-inputs/ett.xi
diff --git a/unittest/input-files/xargs-inputs/files.xi b/testsuite/input-files/xargs-inputs/files.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/files.xi
rename to testsuite/input-files/xargs-inputs/files.xi
diff --git a/unittest/input-files/xargs-inputs/files0.xi b/testsuite/input-files/xargs-inputs/files0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/files0.xi
rename to testsuite/input-files/xargs-inputs/files0.xi
diff --git a/unittest/input-files/xargs-inputs/foobar.xi b/testsuite/input-files/xargs-inputs/foobar.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/foobar.xi
rename to testsuite/input-files/xargs-inputs/foobar.xi
diff --git a/unittest/input-files/xargs-inputs/formfeeds.xi b/testsuite/input-files/xargs-inputs/formfeeds.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/formfeeds.xi
rename to testsuite/input-files/xargs-inputs/formfeeds.xi
diff --git a/unittest/input-files/xargs-inputs/ftt.xi b/testsuite/input-files/xargs-inputs/ftt.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/ftt.xi
rename to testsuite/input-files/xargs-inputs/ftt.xi
diff --git a/unittest/input-files/xargs-inputs/helloworld.xi b/testsuite/input-files/xargs-inputs/helloworld.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/helloworld.xi
rename to testsuite/input-files/xargs-inputs/helloworld.xi
diff --git a/unittest/input-files/xargs-inputs/items-0.xi b/testsuite/input-files/xargs-inputs/items-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/items-0.xi
rename to testsuite/input-files/xargs-inputs/items-0.xi
diff --git a/unittest/input-files/xargs-inputs/items.xi b/testsuite/input-files/xargs-inputs/items.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/items.xi
rename to testsuite/input-files/xargs-inputs/items.xi
diff --git a/unittest/input-files/xargs-inputs/ldata-0.xi b/testsuite/input-files/xargs-inputs/ldata-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/ldata-0.xi
rename to testsuite/input-files/xargs-inputs/ldata-0.xi
diff --git a/unittest/input-files/xargs-inputs/ldata.xi b/testsuite/input-files/xargs-inputs/ldata.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/ldata.xi
rename to testsuite/input-files/xargs-inputs/ldata.xi
diff --git a/unittest/input-files/xargs-inputs/ldatab-0.xi b/testsuite/input-files/xargs-inputs/ldatab-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/ldatab-0.xi
rename to testsuite/input-files/xargs-inputs/ldatab-0.xi
diff --git a/unittest/input-files/xargs-inputs/ldatab.xi b/testsuite/input-files/xargs-inputs/ldatab.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/ldatab.xi
rename to testsuite/input-files/xargs-inputs/ldatab.xi
diff --git a/unittest/input-files/xargs-inputs/lines.xi b/testsuite/input-files/xargs-inputs/lines.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/lines.xi
rename to testsuite/input-files/xargs-inputs/lines.xi
diff --git a/unittest/input-files/xargs-inputs/noeof-0.xi b/testsuite/input-files/xargs-inputs/noeof-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/noeof-0.xi
rename to testsuite/input-files/xargs-inputs/noeof-0.xi
diff --git a/unittest/input-files/xargs-inputs/noeof.xi b/testsuite/input-files/xargs-inputs/noeof.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/noeof.xi
rename to testsuite/input-files/xargs-inputs/noeof.xi
diff --git a/unittest/input-files/xargs-inputs/quotes.xi b/testsuite/input-files/xargs-inputs/quotes.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/quotes.xi
rename to testsuite/input-files/xargs-inputs/quotes.xi
diff --git a/unittest/input-files/xargs-inputs/space.xi b/testsuite/input-files/xargs-inputs/space.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/space.xi
rename to testsuite/input-files/xargs-inputs/space.xi
diff --git a/unittest/input-files/xargs-inputs/stairs-0.xi b/testsuite/input-files/xargs-inputs/stairs-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/stairs-0.xi
rename to testsuite/input-files/xargs-inputs/stairs-0.xi
diff --git a/unittest/input-files/xargs-inputs/stairs.xi b/testsuite/input-files/xargs-inputs/stairs.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/stairs.xi
rename to testsuite/input-files/xargs-inputs/stairs.xi
diff --git a/unittest/input-files/xargs-inputs/stairs2-0.xi b/testsuite/input-files/xargs-inputs/stairs2-0.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/stairs2-0.xi
rename to testsuite/input-files/xargs-inputs/stairs2-0.xi
diff --git a/unittest/input-files/xargs-inputs/stairs2.xi b/testsuite/input-files/xargs-inputs/stairs2.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/stairs2.xi
rename to testsuite/input-files/xargs-inputs/stairs2.xi
diff --git a/unittest/input-files/xargs-inputs/stt.xi b/testsuite/input-files/xargs-inputs/stt.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/stt.xi
rename to testsuite/input-files/xargs-inputs/stt.xi
diff --git a/unittest/input-files/xargs-inputs/sv-bug-20273.xi b/testsuite/input-files/xargs-inputs/sv-bug-20273.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/sv-bug-20273.xi
rename to testsuite/input-files/xargs-inputs/sv-bug-20273.xi
diff --git a/unittest/input-files/xargs-inputs/unmatched.xi b/testsuite/input-files/xargs-inputs/unmatched.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/unmatched.xi
rename to testsuite/input-files/xargs-inputs/unmatched.xi
diff --git a/unittest/input-files/xargs-inputs/unmatched2.xi b/testsuite/input-files/xargs-inputs/unmatched2.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/unmatched2.xi
rename to testsuite/input-files/xargs-inputs/unmatched2.xi
diff --git a/unittest/input-files/xargs-inputs/verticaltabs.xi b/testsuite/input-files/xargs-inputs/verticaltabs.xi
similarity index 100%
rename from unittest/input-files/xargs-inputs/verticaltabs.xi
rename to testsuite/input-files/xargs-inputs/verticaltabs.xi
diff --git a/unittest/tests-to-run/sem01.sh b/testsuite/tests-to-run/sem01.sh
similarity index 100%
rename from unittest/tests-to-run/sem01.sh
rename to testsuite/tests-to-run/sem01.sh
diff --git a/unittest/tests-to-run/sql01.sh b/testsuite/tests-to-run/sql01.sh
similarity index 100%
rename from unittest/tests-to-run/sql01.sh
rename to testsuite/tests-to-run/sql01.sh
diff --git a/unittest/tests-to-run/sql02.sh b/testsuite/tests-to-run/sql02.sh
similarity index 100%
rename from unittest/tests-to-run/sql02.sh
rename to testsuite/tests-to-run/sql02.sh
diff --git a/unittest/tests-to-run/sql03.sh b/testsuite/tests-to-run/sql03.sh
similarity index 100%
rename from unittest/tests-to-run/sql03.sh
rename to testsuite/tests-to-run/sql03.sh
diff --git a/unittest/tests-to-run/test01.sh b/testsuite/tests-to-run/test01.sh
similarity index 100%
rename from unittest/tests-to-run/test01.sh
rename to testsuite/tests-to-run/test01.sh
diff --git a/unittest/tests-to-run/test02.sh b/testsuite/tests-to-run/test02.sh
similarity index 100%
rename from unittest/tests-to-run/test02.sh
rename to testsuite/tests-to-run/test02.sh
diff --git a/unittest/tests-to-run/test03.sh b/testsuite/tests-to-run/test03.sh
similarity index 100%
rename from unittest/tests-to-run/test03.sh
rename to testsuite/tests-to-run/test03.sh
diff --git a/unittest/tests-to-run/test04.sh b/testsuite/tests-to-run/test04.sh
similarity index 100%
rename from unittest/tests-to-run/test04.sh
rename to testsuite/tests-to-run/test04.sh
diff --git a/unittest/tests-to-run/test05.sh b/testsuite/tests-to-run/test05.sh
similarity index 100%
rename from unittest/tests-to-run/test05.sh
rename to testsuite/tests-to-run/test05.sh
diff --git a/unittest/tests-to-run/test06.sh b/testsuite/tests-to-run/test06.sh
similarity index 100%
rename from unittest/tests-to-run/test06.sh
rename to testsuite/tests-to-run/test06.sh
diff --git a/unittest/tests-to-run/test07.sh b/testsuite/tests-to-run/test07.sh
similarity index 100%
rename from unittest/tests-to-run/test07.sh
rename to testsuite/tests-to-run/test07.sh
diff --git a/unittest/tests-to-run/test08.sh b/testsuite/tests-to-run/test08.sh
similarity index 100%
rename from unittest/tests-to-run/test08.sh
rename to testsuite/tests-to-run/test08.sh
diff --git a/unittest/tests-to-run/test09.sh b/testsuite/tests-to-run/test09.sh
similarity index 100%
rename from unittest/tests-to-run/test09.sh
rename to testsuite/tests-to-run/test09.sh
diff --git a/unittest/tests-to-run/test10.sh b/testsuite/tests-to-run/test10.sh
similarity index 100%
rename from unittest/tests-to-run/test10.sh
rename to testsuite/tests-to-run/test10.sh
diff --git a/unittest/tests-to-run/test11.sh b/testsuite/tests-to-run/test11.sh
similarity index 100%
rename from unittest/tests-to-run/test11.sh
rename to testsuite/tests-to-run/test11.sh
diff --git a/unittest/tests-to-run/test12.sh b/testsuite/tests-to-run/test12.sh
similarity index 100%
rename from unittest/tests-to-run/test12.sh
rename to testsuite/tests-to-run/test12.sh
diff --git a/unittest/tests-to-run/test13.sh b/testsuite/tests-to-run/test13.sh
similarity index 100%
rename from unittest/tests-to-run/test13.sh
rename to testsuite/tests-to-run/test13.sh
diff --git a/unittest/tests-to-run/test14.sh b/testsuite/tests-to-run/test14.sh
similarity index 100%
rename from unittest/tests-to-run/test14.sh
rename to testsuite/tests-to-run/test14.sh
diff --git a/unittest/tests-to-run/test15.sh b/testsuite/tests-to-run/test15.sh
similarity index 100%
rename from unittest/tests-to-run/test15.sh
rename to testsuite/tests-to-run/test15.sh
diff --git a/unittest/tests-to-run/test16.sh b/testsuite/tests-to-run/test16.sh
similarity index 100%
rename from unittest/tests-to-run/test16.sh
rename to testsuite/tests-to-run/test16.sh
diff --git a/unittest/tests-to-run/test17.sh b/testsuite/tests-to-run/test17.sh
similarity index 100%
rename from unittest/tests-to-run/test17.sh
rename to testsuite/tests-to-run/test17.sh
diff --git a/unittest/tests-to-run/test18.sh b/testsuite/tests-to-run/test18.sh
similarity index 100%
rename from unittest/tests-to-run/test18.sh
rename to testsuite/tests-to-run/test18.sh
diff --git a/unittest/tests-to-run/test19.sh b/testsuite/tests-to-run/test19.sh
similarity index 100%
rename from unittest/tests-to-run/test19.sh
rename to testsuite/tests-to-run/test19.sh
diff --git a/unittest/tests-to-run/test20.sh b/testsuite/tests-to-run/test20.sh
similarity index 100%
rename from unittest/tests-to-run/test20.sh
rename to testsuite/tests-to-run/test20.sh
diff --git a/unittest/tests-to-run/test21.sh b/testsuite/tests-to-run/test21.sh
similarity index 100%
rename from unittest/tests-to-run/test21.sh
rename to testsuite/tests-to-run/test21.sh
diff --git a/unittest/tests-to-run/test22.sh b/testsuite/tests-to-run/test22.sh
similarity index 100%
rename from unittest/tests-to-run/test22.sh
rename to testsuite/tests-to-run/test22.sh
diff --git a/unittest/tests-to-run/test23.sh b/testsuite/tests-to-run/test23.sh
similarity index 100%
rename from unittest/tests-to-run/test23.sh
rename to testsuite/tests-to-run/test23.sh
diff --git a/unittest/tests-to-run/test24.sh b/testsuite/tests-to-run/test24.sh
similarity index 100%
rename from unittest/tests-to-run/test24.sh
rename to testsuite/tests-to-run/test24.sh
diff --git a/unittest/tests-to-run/test25.sh b/testsuite/tests-to-run/test25.sh
similarity index 100%
rename from unittest/tests-to-run/test25.sh
rename to testsuite/tests-to-run/test25.sh
diff --git a/unittest/tests-to-run/test26.sh b/testsuite/tests-to-run/test26.sh
similarity index 100%
rename from unittest/tests-to-run/test26.sh
rename to testsuite/tests-to-run/test26.sh
diff --git a/unittest/tests-to-run/test27.sh b/testsuite/tests-to-run/test27.sh
similarity index 100%
rename from unittest/tests-to-run/test27.sh
rename to testsuite/tests-to-run/test27.sh
diff --git a/unittest/tests-to-run/test28.sh b/testsuite/tests-to-run/test28.sh
similarity index 100%
rename from unittest/tests-to-run/test28.sh
rename to testsuite/tests-to-run/test28.sh
diff --git a/unittest/tests-to-run/test29.sh b/testsuite/tests-to-run/test29.sh
similarity index 100%
rename from unittest/tests-to-run/test29.sh
rename to testsuite/tests-to-run/test29.sh
diff --git a/unittest/tests-to-run/test30.sh b/testsuite/tests-to-run/test30.sh
similarity index 100%
rename from unittest/tests-to-run/test30.sh
rename to testsuite/tests-to-run/test30.sh
diff --git a/unittest/tests-to-run/test31.sh b/testsuite/tests-to-run/test31.sh
similarity index 100%
rename from unittest/tests-to-run/test31.sh
rename to testsuite/tests-to-run/test31.sh
diff --git a/unittest/tests-to-run/test32.sh b/testsuite/tests-to-run/test32.sh
similarity index 100%
rename from unittest/tests-to-run/test32.sh
rename to testsuite/tests-to-run/test32.sh
diff --git a/unittest/tests-to-run/test33.sh b/testsuite/tests-to-run/test33.sh
similarity index 100%
rename from unittest/tests-to-run/test33.sh
rename to testsuite/tests-to-run/test33.sh
diff --git a/unittest/wanted-results/sem01 b/testsuite/wanted-results/sem01
similarity index 100%
rename from unittest/wanted-results/sem01
rename to testsuite/wanted-results/sem01
diff --git a/unittest/wanted-results/sql01 b/testsuite/wanted-results/sql01
similarity index 100%
rename from unittest/wanted-results/sql01
rename to testsuite/wanted-results/sql01
diff --git a/unittest/wanted-results/sql02 b/testsuite/wanted-results/sql02
similarity index 100%
rename from unittest/wanted-results/sql02
rename to testsuite/wanted-results/sql02
diff --git a/unittest/wanted-results/sql03 b/testsuite/wanted-results/sql03
similarity index 100%
rename from unittest/wanted-results/sql03
rename to testsuite/wanted-results/sql03
diff --git a/unittest/wanted-results/test01 b/testsuite/wanted-results/test01
similarity index 100%
rename from unittest/wanted-results/test01
rename to testsuite/wanted-results/test01
diff --git a/unittest/wanted-results/test02 b/testsuite/wanted-results/test02
similarity index 100%
rename from unittest/wanted-results/test02
rename to testsuite/wanted-results/test02
diff --git a/unittest/wanted-results/test03 b/testsuite/wanted-results/test03
similarity index 100%
rename from unittest/wanted-results/test03
rename to testsuite/wanted-results/test03
diff --git a/unittest/wanted-results/test04 b/testsuite/wanted-results/test04
similarity index 100%
rename from unittest/wanted-results/test04
rename to testsuite/wanted-results/test04
diff --git a/unittest/wanted-results/test05 b/testsuite/wanted-results/test05
similarity index 100%
rename from unittest/wanted-results/test05
rename to testsuite/wanted-results/test05
diff --git a/unittest/wanted-results/test06 b/testsuite/wanted-results/test06
similarity index 100%
rename from unittest/wanted-results/test06
rename to testsuite/wanted-results/test06
diff --git a/unittest/wanted-results/test07 b/testsuite/wanted-results/test07
similarity index 100%
rename from unittest/wanted-results/test07
rename to testsuite/wanted-results/test07
diff --git a/unittest/wanted-results/test08 b/testsuite/wanted-results/test08
similarity index 100%
rename from unittest/wanted-results/test08
rename to testsuite/wanted-results/test08
diff --git a/unittest/wanted-results/test09 b/testsuite/wanted-results/test09
similarity index 100%
rename from unittest/wanted-results/test09
rename to testsuite/wanted-results/test09
diff --git a/unittest/wanted-results/test10 b/testsuite/wanted-results/test10
similarity index 100%
rename from unittest/wanted-results/test10
rename to testsuite/wanted-results/test10
diff --git a/unittest/wanted-results/test11 b/testsuite/wanted-results/test11
similarity index 100%
rename from unittest/wanted-results/test11
rename to testsuite/wanted-results/test11
diff --git a/unittest/wanted-results/test12 b/testsuite/wanted-results/test12
similarity index 100%
rename from unittest/wanted-results/test12
rename to testsuite/wanted-results/test12
diff --git a/unittest/wanted-results/test13 b/testsuite/wanted-results/test13
similarity index 100%
rename from unittest/wanted-results/test13
rename to testsuite/wanted-results/test13
diff --git a/unittest/wanted-results/test14 b/testsuite/wanted-results/test14
similarity index 100%
rename from unittest/wanted-results/test14
rename to testsuite/wanted-results/test14
diff --git a/unittest/wanted-results/test15 b/testsuite/wanted-results/test15
similarity index 100%
rename from unittest/wanted-results/test15
rename to testsuite/wanted-results/test15
diff --git a/unittest/wanted-results/test16 b/testsuite/wanted-results/test16
similarity index 100%
rename from unittest/wanted-results/test16
rename to testsuite/wanted-results/test16
diff --git a/unittest/wanted-results/test17 b/testsuite/wanted-results/test17
similarity index 100%
rename from unittest/wanted-results/test17
rename to testsuite/wanted-results/test17
diff --git a/unittest/wanted-results/test18 b/testsuite/wanted-results/test18
similarity index 100%
rename from unittest/wanted-results/test18
rename to testsuite/wanted-results/test18
diff --git a/unittest/wanted-results/test19 b/testsuite/wanted-results/test19
similarity index 100%
rename from unittest/wanted-results/test19
rename to testsuite/wanted-results/test19
diff --git a/unittest/wanted-results/test20 b/testsuite/wanted-results/test20
similarity index 100%
rename from unittest/wanted-results/test20
rename to testsuite/wanted-results/test20
diff --git a/unittest/wanted-results/test21 b/testsuite/wanted-results/test21
similarity index 100%
rename from unittest/wanted-results/test21
rename to testsuite/wanted-results/test21
diff --git a/unittest/wanted-results/test22 b/testsuite/wanted-results/test22
similarity index 100%
rename from unittest/wanted-results/test22
rename to testsuite/wanted-results/test22
diff --git a/unittest/wanted-results/test23 b/testsuite/wanted-results/test23
similarity index 100%
rename from unittest/wanted-results/test23
rename to testsuite/wanted-results/test23
diff --git a/unittest/wanted-results/test24 b/testsuite/wanted-results/test24
similarity index 100%
rename from unittest/wanted-results/test24
rename to testsuite/wanted-results/test24
diff --git a/unittest/wanted-results/test25 b/testsuite/wanted-results/test25
similarity index 100%
rename from unittest/wanted-results/test25
rename to testsuite/wanted-results/test25
diff --git a/unittest/wanted-results/test26 b/testsuite/wanted-results/test26
similarity index 100%
rename from unittest/wanted-results/test26
rename to testsuite/wanted-results/test26
diff --git a/unittest/wanted-results/test27 b/testsuite/wanted-results/test27
similarity index 100%
rename from unittest/wanted-results/test27
rename to testsuite/wanted-results/test27
diff --git a/unittest/wanted-results/test28 b/testsuite/wanted-results/test28
similarity index 100%
rename from unittest/wanted-results/test28
rename to testsuite/wanted-results/test28
diff --git a/unittest/wanted-results/test29 b/testsuite/wanted-results/test29
similarity index 100%
rename from unittest/wanted-results/test29
rename to testsuite/wanted-results/test29
diff --git a/unittest/wanted-results/test30 b/testsuite/wanted-results/test30
similarity index 100%
rename from unittest/wanted-results/test30
rename to testsuite/wanted-results/test30
diff --git a/unittest/wanted-results/test31 b/testsuite/wanted-results/test31
similarity index 100%
rename from unittest/wanted-results/test31
rename to testsuite/wanted-results/test31
diff --git a/unittest/wanted-results/test32 b/testsuite/wanted-results/test32
similarity index 100%
rename from unittest/wanted-results/test32
rename to testsuite/wanted-results/test32
diff --git a/unittest/wanted-results/test33 b/testsuite/wanted-results/test33
similarity index 100%
rename from unittest/wanted-results/test33
rename to testsuite/wanted-results/test33
diff --git a/unittest/Makefile b/unittest/Makefile
deleted file mode 100644
index 0adf7156..00000000
--- a/unittest/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-unittest: ../src/parallel tests-to-run/* wanted-results/*
-	echo | mop || (echo mop is required for unittest; /bin/false)
-	seq 1 2 | mop || (echo seq is required for unittest; /bin/false)
-	stdout echo || (echo stdout is required for unittest; /bin/false)
-	convert | mop || (echo convert is required for unittest; /bin/false)
-	ren 2>&1 | mop || (echo ren is required for unittest; /bin/false)
-	echo | buffer | mop || (echo buffer is required for unittest; /bin/false)
-	echo 1+2 | bc | mop || (echo bc is required for unittest; /bin/false)
-	stdout gawk | mop || (echo gawk is required for unittest; /bin/false)
-	expect -c 'spawn cat; puts "expect is installed"' || (echo expect is required for unittest; /bin/false)
-	echo | pv -qL 10 || (echo pv is required for unittest; /bin/false)
-	echo | script -c echo -q /dev/null || (echo script is required for unittest; /bin/false)
-	niceload true || (echo niceload is required for unittest; /bin/false)
-	time sh Start.sh
-	date
-
-clean:
-	rm -rf input-files/random_dirs_no_newline
-	rm -rf input-files/random_dirs_with_newline
-
-dist:
-	rm -rf input-files/random_dirs_*_newline || /bin/true
-	rm -rf tmp || /bin/true
-	( cd ..; tar -cvj --exclude .git --exclude '#*#' --exclude '*~' --exclude CVS -f /tmp/parallel.tar.bz2 parallel-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] )
-	mv /tmp/parallel.tar.bz2 parallel-$$(date +"%Y%m%d").tar.bz2
-	rsync -Havessh parallel-$$(date +"%Y%m%d").tar.bz2 download.savannah.nongnu.org:/releases/parallel/
-