diff --git a/Makefile.am b/Makefile.am
index 6f288b2ac..d37f768e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ if USE_PYTHON
   PYTHON_SUBDIR = python
 endif
 
-SUBDIRS = buddy lib ltdl spot $(PYTHON_SUBDIR) doc $(NEVER_SUBDIRS)
+SUBDIRS = buddy lib ltdl spot bin tests $(PYTHON_SUBDIR) doc $(NEVER_SUBDIRS)
 
 UTF8 = utf8/doc/ReleaseNotes utf8/doc/utf8cpp.html utf8/utf8.h	\
   utf8/utf8/checked.h utf8/utf8/core.h utf8/utf8/unchecked.h
diff --git a/README b/README
index 831668d09..871aeb7ab 100644
--- a/README
+++ b/README
@@ -135,8 +135,6 @@ Core directories
 ----------------
 
 spot/             Sources for libspot.
-   bin/           User tools built using the Spot library.
-      man/        Man pages for the above tools.
    graph/         Graph representations.
    ltsmin/        Interface with DiVinE2 and SpinS.  (Not part of libspot.)
    kripke/        Kripke Structure interface.
@@ -147,11 +145,13 @@ spot/             Sources for libspot.
    priv/          Private algorithms, used internally but not exported.
    ta/            TA objects and cousins (TGTA).
    taalgos/       Algorithms on TA/TGTA.
-   tests/         Tests for the whole library.
    twa/           TωA objects and cousins (Transition-based ω-Automata).
    twaalgos/      Algorithms on TωA.
       gtec/       Couvreur's Emptiness-Check.
    sanity/        Sanity tests for the whole project.
+bin/              Command-line tools built on top of libspot.
+   man/           Man pages for the above tools.
+tests/            Tests for libspot and the binaries.
 doc/              Documentation for Spot.
    org/           Source of userdoc/ as org-mode files.
    tl/            Documentation of the Temporal Logic operators.
diff --git a/bench/stutter/Makefile.am b/bench/stutter/Makefile.am
index ff4e35075..398cc597e 100644
--- a/bench/stutter/Makefile.am
+++ b/bench/stutter/Makefile.am
@@ -21,8 +21,10 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
-LDADD = $(top_builddir)/spot/bin/libcommon.a ../../lib/libgnu.la	\
-        ../../spot/libspot.la
+LDADD =						\
+  $(top_builddir)/bin/libcommon.a		\
+  $(top_builddir)/lib/libgnu.la			\
+  $(top_builddir)/spot/libspot.la
 
 bin_PROGRAMS = stutter_invariance_randomgraph \
 	       stutter_invariance_formulas
diff --git a/bench/stutter/stutter_invariance_formulas.cc b/bench/stutter/stutter_invariance_formulas.cc
index 60cfa0f43..9ed9effe2 100644
--- a/bench/stutter/stutter_invariance_formulas.cc
+++ b/bench/stutter/stutter_invariance_formulas.cc
@@ -17,10 +17,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "spot/bin/common_sys.hh"
-#include "spot/bin/common_setup.hh"
-#include "spot/bin/common_finput.hh"
-#include "spot/bin/common_output.hh"
+#include "bin/common_sys.hh"
+#include "bin/common_setup.hh"
+#include "bin/common_finput.hh"
+#include "bin/common_output.hh"
 #include <spot/twaalgos/translate.hh>
 #include <spot/twaalgos/stutter.hh>
 #include <spot/twaalgos/stats.hh>
diff --git a/spot/bin/.gitignore b/bin/.gitignore
similarity index 100%
rename from spot/bin/.gitignore
rename to bin/.gitignore
diff --git a/spot/bin/Makefile.am b/bin/Makefile.am
similarity index 95%
rename from spot/bin/Makefile.am
rename to bin/Makefile.am
index 0673fe493..e0e4254f8 100644
--- a/spot/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -22,7 +22,10 @@ SUBDIRS = . man
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS) \
               -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
-LDADD = libcommon.a $(top_builddir)/lib/libgnu.la ../libspot.la
+LDADD =						\
+  libcommon.a					\
+  $(top_builddir)/lib/libgnu.la			\
+  $(top_builddir)/spot/libspot.la
 
 noinst_LIBRARIES = libcommon.a
 libcommon_a_SOURCES =				\
diff --git a/spot/bin/README b/bin/README
similarity index 100%
rename from spot/bin/README
rename to bin/README
diff --git a/spot/bin/autfilt.cc b/bin/autfilt.cc
similarity index 100%
rename from spot/bin/autfilt.cc
rename to bin/autfilt.cc
diff --git a/spot/bin/common_aoutput.cc b/bin/common_aoutput.cc
similarity index 100%
rename from spot/bin/common_aoutput.cc
rename to bin/common_aoutput.cc
diff --git a/spot/bin/common_aoutput.hh b/bin/common_aoutput.hh
similarity index 100%
rename from spot/bin/common_aoutput.hh
rename to bin/common_aoutput.hh
diff --git a/spot/bin/common_conv.cc b/bin/common_conv.cc
similarity index 100%
rename from spot/bin/common_conv.cc
rename to bin/common_conv.cc
diff --git a/spot/bin/common_conv.hh b/bin/common_conv.hh
similarity index 100%
rename from spot/bin/common_conv.hh
rename to bin/common_conv.hh
diff --git a/spot/bin/common_cout.cc b/bin/common_cout.cc
similarity index 100%
rename from spot/bin/common_cout.cc
rename to bin/common_cout.cc
diff --git a/spot/bin/common_cout.hh b/bin/common_cout.hh
similarity index 100%
rename from spot/bin/common_cout.hh
rename to bin/common_cout.hh
diff --git a/spot/bin/common_file.cc b/bin/common_file.cc
similarity index 100%
rename from spot/bin/common_file.cc
rename to bin/common_file.cc
diff --git a/spot/bin/common_file.hh b/bin/common_file.hh
similarity index 100%
rename from spot/bin/common_file.hh
rename to bin/common_file.hh
diff --git a/spot/bin/common_finput.cc b/bin/common_finput.cc
similarity index 100%
rename from spot/bin/common_finput.cc
rename to bin/common_finput.cc
diff --git a/spot/bin/common_finput.hh b/bin/common_finput.hh
similarity index 100%
rename from spot/bin/common_finput.hh
rename to bin/common_finput.hh
diff --git a/spot/bin/common_hoaread.cc b/bin/common_hoaread.cc
similarity index 100%
rename from spot/bin/common_hoaread.cc
rename to bin/common_hoaread.cc
diff --git a/spot/bin/common_hoaread.hh b/bin/common_hoaread.hh
similarity index 100%
rename from spot/bin/common_hoaread.hh
rename to bin/common_hoaread.hh
diff --git a/spot/bin/common_output.cc b/bin/common_output.cc
similarity index 100%
rename from spot/bin/common_output.cc
rename to bin/common_output.cc
diff --git a/spot/bin/common_output.hh b/bin/common_output.hh
similarity index 100%
rename from spot/bin/common_output.hh
rename to bin/common_output.hh
diff --git a/spot/bin/common_post.cc b/bin/common_post.cc
similarity index 100%
rename from spot/bin/common_post.cc
rename to bin/common_post.cc
diff --git a/spot/bin/common_post.hh b/bin/common_post.hh
similarity index 100%
rename from spot/bin/common_post.hh
rename to bin/common_post.hh
diff --git a/spot/bin/common_r.cc b/bin/common_r.cc
similarity index 100%
rename from spot/bin/common_r.cc
rename to bin/common_r.cc
diff --git a/spot/bin/common_r.hh b/bin/common_r.hh
similarity index 100%
rename from spot/bin/common_r.hh
rename to bin/common_r.hh
diff --git a/spot/bin/common_range.cc b/bin/common_range.cc
similarity index 100%
rename from spot/bin/common_range.cc
rename to bin/common_range.cc
diff --git a/spot/bin/common_range.hh b/bin/common_range.hh
similarity index 100%
rename from spot/bin/common_range.hh
rename to bin/common_range.hh
diff --git a/spot/bin/common_setup.cc b/bin/common_setup.cc
similarity index 100%
rename from spot/bin/common_setup.cc
rename to bin/common_setup.cc
diff --git a/spot/bin/common_setup.hh b/bin/common_setup.hh
similarity index 100%
rename from spot/bin/common_setup.hh
rename to bin/common_setup.hh
diff --git a/spot/bin/common_sys.hh b/bin/common_sys.hh
similarity index 100%
rename from spot/bin/common_sys.hh
rename to bin/common_sys.hh
diff --git a/spot/bin/common_trans.cc b/bin/common_trans.cc
similarity index 100%
rename from spot/bin/common_trans.cc
rename to bin/common_trans.cc
diff --git a/spot/bin/common_trans.hh b/bin/common_trans.hh
similarity index 100%
rename from spot/bin/common_trans.hh
rename to bin/common_trans.hh
diff --git a/spot/bin/dstar2tgba.cc b/bin/dstar2tgba.cc
similarity index 100%
rename from spot/bin/dstar2tgba.cc
rename to bin/dstar2tgba.cc
diff --git a/spot/bin/genltl.cc b/bin/genltl.cc
similarity index 100%
rename from spot/bin/genltl.cc
rename to bin/genltl.cc
diff --git a/spot/bin/ltl2tgba.cc b/bin/ltl2tgba.cc
similarity index 100%
rename from spot/bin/ltl2tgba.cc
rename to bin/ltl2tgba.cc
diff --git a/spot/bin/ltl2tgta.cc b/bin/ltl2tgta.cc
similarity index 100%
rename from spot/bin/ltl2tgta.cc
rename to bin/ltl2tgta.cc
diff --git a/spot/bin/ltlcross.cc b/bin/ltlcross.cc
similarity index 100%
rename from spot/bin/ltlcross.cc
rename to bin/ltlcross.cc
diff --git a/spot/bin/ltldo.cc b/bin/ltldo.cc
similarity index 100%
rename from spot/bin/ltldo.cc
rename to bin/ltldo.cc
diff --git a/spot/bin/ltlfilt.cc b/bin/ltlfilt.cc
similarity index 100%
rename from spot/bin/ltlfilt.cc
rename to bin/ltlfilt.cc
diff --git a/spot/bin/ltlgrind.cc b/bin/ltlgrind.cc
similarity index 100%
rename from spot/bin/ltlgrind.cc
rename to bin/ltlgrind.cc
diff --git a/spot/bin/man/Makefile.am b/bin/man/Makefile.am
similarity index 100%
rename from spot/bin/man/Makefile.am
rename to bin/man/Makefile.am
diff --git a/spot/bin/man/autfilt.x b/bin/man/autfilt.x
similarity index 100%
rename from spot/bin/man/autfilt.x
rename to bin/man/autfilt.x
diff --git a/spot/bin/man/dstar2tgba.x b/bin/man/dstar2tgba.x
similarity index 100%
rename from spot/bin/man/dstar2tgba.x
rename to bin/man/dstar2tgba.x
diff --git a/spot/bin/man/genltl.x b/bin/man/genltl.x
similarity index 100%
rename from spot/bin/man/genltl.x
rename to bin/man/genltl.x
diff --git a/spot/bin/man/ltl2tgba.x b/bin/man/ltl2tgba.x
similarity index 100%
rename from spot/bin/man/ltl2tgba.x
rename to bin/man/ltl2tgba.x
diff --git a/spot/bin/man/ltl2tgta.x b/bin/man/ltl2tgta.x
similarity index 100%
rename from spot/bin/man/ltl2tgta.x
rename to bin/man/ltl2tgta.x
diff --git a/spot/bin/man/ltlcross.x b/bin/man/ltlcross.x
similarity index 100%
rename from spot/bin/man/ltlcross.x
rename to bin/man/ltlcross.x
diff --git a/spot/bin/man/ltldo.x b/bin/man/ltldo.x
similarity index 100%
rename from spot/bin/man/ltldo.x
rename to bin/man/ltldo.x
diff --git a/spot/bin/man/ltlfilt.x b/bin/man/ltlfilt.x
similarity index 100%
rename from spot/bin/man/ltlfilt.x
rename to bin/man/ltlfilt.x
diff --git a/spot/bin/man/ltlgrind.x b/bin/man/ltlgrind.x
similarity index 100%
rename from spot/bin/man/ltlgrind.x
rename to bin/man/ltlgrind.x
diff --git a/spot/bin/man/randaut.x b/bin/man/randaut.x
similarity index 100%
rename from spot/bin/man/randaut.x
rename to bin/man/randaut.x
diff --git a/spot/bin/man/randltl.x b/bin/man/randltl.x
similarity index 100%
rename from spot/bin/man/randltl.x
rename to bin/man/randltl.x
diff --git a/spot/bin/man/spot-x.x b/bin/man/spot-x.x
similarity index 100%
rename from spot/bin/man/spot-x.x
rename to bin/man/spot-x.x
diff --git a/spot/bin/options.py b/bin/options.py
similarity index 100%
rename from spot/bin/options.py
rename to bin/options.py
diff --git a/spot/bin/randaut.cc b/bin/randaut.cc
similarity index 100%
rename from spot/bin/randaut.cc
rename to bin/randaut.cc
diff --git a/spot/bin/randltl.cc b/bin/randltl.cc
similarity index 100%
rename from spot/bin/randltl.cc
rename to bin/randltl.cc
diff --git a/spot/bin/spot-x.cc b/bin/spot-x.cc
similarity index 100%
rename from spot/bin/spot-x.cc
rename to bin/spot-x.cc
diff --git a/configure.ac b/configure.ac
index 8088ce38a..371507e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,6 +181,8 @@ fi)])
 
 AC_CONFIG_FILES([
   Makefile
+  bin/Makefile
+  bin/man/Makefile
   bench/Makefile
   bench/dtgbasat/Makefile
   bench/emptchk/Makefile
@@ -199,8 +201,6 @@ AC_CONFIG_FILES([
   doc/org/init.el
   elisp/Makefile
   lib/Makefile
-  spot/bin/Makefile
-  spot/bin/man/Makefile
   spot/graph/Makefile
   spot/kripke/Makefile
   spot/ltsmin/defs
@@ -213,8 +213,6 @@ AC_CONFIG_FILES([
   spot/sanity/Makefile
   spot/taalgos/Makefile
   spot/ta/Makefile
-  spot/tests/defs
-  spot/tests/Makefile
   spot/tl/Makefile
   spot/twaalgos/gtec/Makefile
   spot/twaalgos/Makefile
@@ -222,6 +220,8 @@ AC_CONFIG_FILES([
   python/ajax/Makefile
   python/Makefile
   python/tests/Makefile
+  tests/defs
+  tests/Makefile
   tools/x-to-1
 ])
 AC_CONFIG_FILES([doc/org/g++wrap], [chmod +x doc/org/g++wrap])
diff --git a/debian/rules b/debian/rules
index e74ffa02c..5f836c334 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,8 @@ PYOTHERS=$(filter-out $(PYDEFAULT), $(shell py3versions --supported))
 # compiled with -flto, the exception never traverses argp.  Moving
 # the try/catch block inside parse_opt() also fixes this praticular
 # problem, but who knows about other exceptions?   So as a workaround,
-# we simply disable -flto in spot/bin/.
-FLTOWORKAROUND = perl -pi -e s/-flto// spot/bin/Makefile
+# we simply disable -flto in bin/.
+FLTOWORKAROUND = perl -pi -e s/-flto// bin/Makefile
 
 # We want to build Spot twice: once to get profile data, and a second
 # time to use it.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c8795af17..7ce54e920 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -58,7 +58,7 @@ org:
 
 org-man:
 	mkdir -p $(srcdir)/userdoc/man
-	$(top_srcdir)/tools/man2html.pl $(top_srcdir)/spot/bin/man $(srcdir)/userdoc/man
+	$(top_srcdir)/tools/man2html.pl $(top_srcdir)/bin/man $(srcdir)/userdoc/man
 
 ORG_FILES = \
   org/.dir-locals.el.in \
diff --git a/python/tests/run.in b/python/tests/run.in
index 64c54a0b5..36990d475 100755
--- a/python/tests/run.in
+++ b/python/tests/run.in
@@ -32,7 +32,7 @@ modpath='../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/spot/.libs'
 # Python 2.6.
 pypath='..:../.libs:@srcdir@/..:@srcdir@/../.libs:$PYTHONPATH'
 
-PATH="@abs_top_builddir@/spot/bin:$PATH"
+PATH="@abs_top_builddir@/bin:$PATH"
 export PATH
 
 test -z "$1" &&
diff --git a/spot/Makefile.am b/spot/Makefile.am
index 58cbc4683..54e27696c 100644
--- a/spot/Makefile.am
+++ b/spot/Makefile.am
@@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # end, after building '.' (since the current directory contains
 # libspot.la needed by the tests)
 SUBDIRS = misc priv tl graph twa twaalgos ta taalgos kripke	\
-          parseaut parsetl . bin tests ltsmin sanity
+          parseaut parsetl . ltsmin sanity
 
 lib_LTLIBRARIES = libspot.la
 libspot_la_SOURCES =
diff --git a/spot/ltsmin/Makefile.am b/spot/ltsmin/Makefile.am
index ad771dc0f..1f94a63df 100644
--- a/spot/ltsmin/Makefile.am
+++ b/spot/ltsmin/Makefile.am
@@ -42,10 +42,10 @@ check_SCRIPTS = defs
 TESTS = check.test finite.test finite2.test kripke.test
 EXTRA_DIST = $(TESTS) beem-peterson.4.dve finite.dve finite.pm
 
-kripke.test: $(top_builddir)/spot/tests/parse_print$(EXEEXT)
+kripke.test: $(top_builddir)/tests/parse_print$(EXEEXT)
 
-$(top_builddir)/spot/tests/parse_print$(EXEEXT):
-	cd $(top_builddir)/spot/tests && \
+$(top_builddir)/tests/parse_print$(EXEEXT):
+	cd $(top_builddir)/tests && \
 	$(MAKE) $(AM_MAKEFLAGS) parse_print$(EXEEXT)
 
 distclean-local:
diff --git a/spot/ltsmin/kripke.test b/spot/ltsmin/kripke.test
index c869d92a2..1c95666b7 100755
--- a/spot/ltsmin/kripke.test
+++ b/spot/ltsmin/kripke.test
@@ -33,10 +33,10 @@ fi
 
 set -e
 
-run 0 ../modelcheck -gK ${srcdir}/finite.dve 'F("P.a > 5")' > output
-run 0 ${top_builddir}/spot/tests/parse_print output | tr -d '"' > output2
+run 0 ../modelcheck -gK $srcdir/finite.dve 'F("P.a > 5")' > output
+run 0 $top_builddir/tests/parse_print output | tr -d '"' > output2
 tr -d '"' < output >outputF
 cmp outputF output2
 
 ../modelcheck -gK $srcdir/beem-peterson.4.dve '!G("pos[1] < 3")' > outputP
-${top_builddir}/spot/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'
+$top_builddir/tests/ikwiad -e -KPoutputP '!G("pos[1] < 3")'
diff --git a/spot/sanity/style.test b/spot/sanity/style.test
index c7ce8f7cf..f6fc0e795 100755
--- a/spot/sanity/style.test
+++ b/spot/sanity/style.test
@@ -55,7 +55,7 @@ tmp=incltest.tmp
 # We used to loop over more directories before the source tree was
 # rearranged.  So there is only one left today, but we keep the loop
 # in case we want to add more in the future.
-for dir in "${INCDIR-..}"; do
+for dir in "${INCDIR-..}" "${INCDIR-..}/../bin" "${INCDIR-..}/../tests"; do
 
   find "$dir" \(    -name "${1-*}.hh" \
                  -o -name "${1-*}.hxx" \
@@ -329,7 +329,7 @@ done
 
 
 # Rules for Makefiles.
-for dir in "${INCDIR-..}"; do
+for dir in "${INCDIR-..}" "${INCDIR-..}/../bin" "${INCDIR-..}/../tests"; do
 
   find "$dir" -name "Makefile.am" -a -type f -a -print |
   while read file; do
diff --git a/spot/tests/.gitignore b/tests/.gitignore
similarity index 100%
rename from spot/tests/.gitignore
rename to tests/.gitignore
diff --git a/spot/tests/Makefile.am b/tests/Makefile.am
similarity index 99%
rename from spot/tests/Makefile.am
rename to tests/Makefile.am
index 2cb7c301a..f5fb56308 100644
--- a/spot/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,7 +22,7 @@
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
-LDADD = ../libspot.la
+LDADD = $(top_builddir)/spot/libspot.la
 
 # These are the most used test programs, and they are also useful
 # to run manually outside the test suite.  Always build them.
diff --git a/spot/tests/acc.cc b/tests/acc.cc
similarity index 100%
rename from spot/tests/acc.cc
rename to tests/acc.cc
diff --git a/spot/tests/acc.test b/tests/acc.test
similarity index 100%
rename from spot/tests/acc.test
rename to tests/acc.test
diff --git a/spot/tests/acc2.test b/tests/acc2.test
similarity index 100%
rename from spot/tests/acc2.test
rename to tests/acc2.test
diff --git a/spot/tests/babiak.test b/tests/babiak.test
similarity index 100%
rename from spot/tests/babiak.test
rename to tests/babiak.test
diff --git a/spot/tests/bare.test b/tests/bare.test
similarity index 100%
rename from spot/tests/bare.test
rename to tests/bare.test
diff --git a/spot/tests/basimul.test b/tests/basimul.test
similarity index 100%
rename from spot/tests/basimul.test
rename to tests/basimul.test
diff --git a/spot/tests/bitvect.cc b/tests/bitvect.cc
similarity index 100%
rename from spot/tests/bitvect.cc
rename to tests/bitvect.cc
diff --git a/spot/tests/bitvect.test b/tests/bitvect.test
similarity index 100%
rename from spot/tests/bitvect.test
rename to tests/bitvect.test
diff --git a/spot/tests/checkpsl.cc b/tests/checkpsl.cc
similarity index 100%
rename from spot/tests/checkpsl.cc
rename to tests/checkpsl.cc
diff --git a/spot/tests/checkta.cc b/tests/checkta.cc
similarity index 100%
rename from spot/tests/checkta.cc
rename to tests/checkta.cc
diff --git a/spot/tests/complement.test b/tests/complement.test
similarity index 100%
rename from spot/tests/complement.test
rename to tests/complement.test
diff --git a/spot/tests/complementation.cc b/tests/complementation.cc
similarity index 100%
rename from spot/tests/complementation.cc
rename to tests/complementation.cc
diff --git a/spot/tests/complementation.test b/tests/complementation.test
similarity index 100%
rename from spot/tests/complementation.test
rename to tests/complementation.test
diff --git a/spot/tests/complete.test b/tests/complete.test
similarity index 100%
rename from spot/tests/complete.test
rename to tests/complete.test
diff --git a/spot/tests/consterm.cc b/tests/consterm.cc
similarity index 100%
rename from spot/tests/consterm.cc
rename to tests/consterm.cc
diff --git a/spot/tests/consterm.test b/tests/consterm.test
similarity index 100%
rename from spot/tests/consterm.test
rename to tests/consterm.test
diff --git a/spot/tests/cycles.test b/tests/cycles.test
similarity index 100%
rename from spot/tests/cycles.test
rename to tests/cycles.test
diff --git a/spot/tests/dbacomp.test b/tests/dbacomp.test
similarity index 100%
rename from spot/tests/dbacomp.test
rename to tests/dbacomp.test
diff --git a/spot/tests/defs.in b/tests/defs.in
similarity index 98%
rename from spot/tests/defs.in
rename to tests/defs.in
index 9e6b07ad8..48cca35e4 100644
--- a/spot/tests/defs.in
+++ b/tests/defs.in
@@ -85,7 +85,7 @@ run()
   if test -n "$VALGRIND"; then
     exec 6>valgrind.err
     GLIBCPP_FORCE_NEW=1 \
-    ../../../libtool --mode=execute \
+    ../../libtool --mode=execute \
     $VALGRIND --tool=memcheck --leak-check=yes --log-fd=6 -q "$@" ||
       exitcode=$?
     cat valgrind.err 1>&2
diff --git a/spot/tests/degendet.test b/tests/degendet.test
similarity index 100%
rename from spot/tests/degendet.test
rename to tests/degendet.test
diff --git a/spot/tests/degenid.test b/tests/degenid.test
similarity index 100%
rename from spot/tests/degenid.test
rename to tests/degenid.test
diff --git a/spot/tests/degenlskip.test b/tests/degenlskip.test
similarity index 100%
rename from spot/tests/degenlskip.test
rename to tests/degenlskip.test
diff --git a/spot/tests/det.test b/tests/det.test
similarity index 100%
rename from spot/tests/det.test
rename to tests/det.test
diff --git a/spot/tests/dfs.test b/tests/dfs.test
similarity index 100%
rename from spot/tests/dfs.test
rename to tests/dfs.test
diff --git a/spot/tests/dra2dba.test b/tests/dra2dba.test
similarity index 100%
rename from spot/tests/dra2dba.test
rename to tests/dra2dba.test
diff --git a/spot/tests/dstar.test b/tests/dstar.test
similarity index 100%
rename from spot/tests/dstar.test
rename to tests/dstar.test
diff --git a/spot/tests/dupexp.test b/tests/dupexp.test
similarity index 100%
rename from spot/tests/dupexp.test
rename to tests/dupexp.test
diff --git a/spot/tests/emptchk.cc b/tests/emptchk.cc
similarity index 100%
rename from spot/tests/emptchk.cc
rename to tests/emptchk.cc
diff --git a/spot/tests/emptchk.test b/tests/emptchk.test
similarity index 100%
rename from spot/tests/emptchk.test
rename to tests/emptchk.test
diff --git a/spot/tests/emptchke.test b/tests/emptchke.test
similarity index 100%
rename from spot/tests/emptchke.test
rename to tests/emptchke.test
diff --git a/spot/tests/emptchkr.test b/tests/emptchkr.test
similarity index 100%
rename from spot/tests/emptchkr.test
rename to tests/emptchkr.test
diff --git a/spot/tests/equals.test b/tests/equals.test
similarity index 100%
rename from spot/tests/equals.test
rename to tests/equals.test
diff --git a/spot/tests/equalsf.cc b/tests/equalsf.cc
similarity index 100%
rename from spot/tests/equalsf.cc
rename to tests/equalsf.cc
diff --git a/spot/tests/eventuniv.test b/tests/eventuniv.test
similarity index 100%
rename from spot/tests/eventuniv.test
rename to tests/eventuniv.test
diff --git a/spot/tests/exclusive-ltl.test b/tests/exclusive-ltl.test
similarity index 100%
rename from spot/tests/exclusive-ltl.test
rename to tests/exclusive-ltl.test
diff --git a/spot/tests/exclusive-tgba.test b/tests/exclusive-tgba.test
similarity index 100%
rename from spot/tests/exclusive-tgba.test
rename to tests/exclusive-tgba.test
diff --git a/spot/tests/explpro2.test b/tests/explpro2.test
similarity index 100%
rename from spot/tests/explpro2.test
rename to tests/explpro2.test
diff --git a/spot/tests/explpro3.test b/tests/explpro3.test
similarity index 100%
rename from spot/tests/explpro3.test
rename to tests/explpro3.test
diff --git a/spot/tests/explpro4.test b/tests/explpro4.test
similarity index 100%
rename from spot/tests/explpro4.test
rename to tests/explpro4.test
diff --git a/spot/tests/explprod.test b/tests/explprod.test
similarity index 100%
rename from spot/tests/explprod.test
rename to tests/explprod.test
diff --git a/spot/tests/graph.cc b/tests/graph.cc
similarity index 100%
rename from spot/tests/graph.cc
rename to tests/graph.cc
diff --git a/spot/tests/graph.test b/tests/graph.test
similarity index 100%
rename from spot/tests/graph.test
rename to tests/graph.test
diff --git a/spot/tests/ikwiad.cc b/tests/ikwiad.cc
similarity index 100%
rename from spot/tests/ikwiad.cc
rename to tests/ikwiad.cc
diff --git a/spot/tests/intvcmp2.cc b/tests/intvcmp2.cc
similarity index 100%
rename from spot/tests/intvcmp2.cc
rename to tests/intvcmp2.cc
diff --git a/spot/tests/intvcomp.cc b/tests/intvcomp.cc
similarity index 100%
rename from spot/tests/intvcomp.cc
rename to tests/intvcomp.cc
diff --git a/spot/tests/intvcomp.test b/tests/intvcomp.test
similarity index 100%
rename from spot/tests/intvcomp.test
rename to tests/intvcomp.test
diff --git a/spot/tests/isomorph.test b/tests/isomorph.test
similarity index 100%
rename from spot/tests/isomorph.test
rename to tests/isomorph.test
diff --git a/spot/tests/isop.test b/tests/isop.test
similarity index 100%
rename from spot/tests/isop.test
rename to tests/isop.test
diff --git a/spot/tests/kind.cc b/tests/kind.cc
similarity index 100%
rename from spot/tests/kind.cc
rename to tests/kind.cc
diff --git a/spot/tests/kind.test b/tests/kind.test
similarity index 100%
rename from spot/tests/kind.test
rename to tests/kind.test
diff --git a/spot/tests/kripke.test b/tests/kripke.test
similarity index 100%
rename from spot/tests/kripke.test
rename to tests/kripke.test
diff --git a/spot/tests/latex.test b/tests/latex.test
similarity index 100%
rename from spot/tests/latex.test
rename to tests/latex.test
diff --git a/spot/tests/lbt.test b/tests/lbt.test
similarity index 100%
rename from spot/tests/lbt.test
rename to tests/lbt.test
diff --git a/spot/tests/lbttparse.test b/tests/lbttparse.test
similarity index 100%
rename from spot/tests/lbttparse.test
rename to tests/lbttparse.test
diff --git a/spot/tests/length.cc b/tests/length.cc
similarity index 100%
rename from spot/tests/length.cc
rename to tests/length.cc
diff --git a/spot/tests/length.test b/tests/length.test
similarity index 100%
rename from spot/tests/length.test
rename to tests/length.test
diff --git a/spot/tests/lenient.test b/tests/lenient.test
similarity index 100%
rename from spot/tests/lenient.test
rename to tests/lenient.test
diff --git a/spot/tests/ltl2dstar.test b/tests/ltl2dstar.test
similarity index 100%
rename from spot/tests/ltl2dstar.test
rename to tests/ltl2dstar.test
diff --git a/spot/tests/ltl2dstar2.test b/tests/ltl2dstar2.test
similarity index 100%
rename from spot/tests/ltl2dstar2.test
rename to tests/ltl2dstar2.test
diff --git a/spot/tests/ltl2dstar3.test b/tests/ltl2dstar3.test
similarity index 100%
rename from spot/tests/ltl2dstar3.test
rename to tests/ltl2dstar3.test
diff --git a/spot/tests/ltl2dstar4.test b/tests/ltl2dstar4.test
similarity index 100%
rename from spot/tests/ltl2dstar4.test
rename to tests/ltl2dstar4.test
diff --git a/spot/tests/ltl2neverclaim-lbtt.test b/tests/ltl2neverclaim-lbtt.test
similarity index 100%
rename from spot/tests/ltl2neverclaim-lbtt.test
rename to tests/ltl2neverclaim-lbtt.test
diff --git a/spot/tests/ltl2neverclaim.test b/tests/ltl2neverclaim.test
similarity index 100%
rename from spot/tests/ltl2neverclaim.test
rename to tests/ltl2neverclaim.test
diff --git a/spot/tests/ltl2ta.test b/tests/ltl2ta.test
similarity index 100%
rename from spot/tests/ltl2ta.test
rename to tests/ltl2ta.test
diff --git a/spot/tests/ltl2ta2.test b/tests/ltl2ta2.test
similarity index 100%
rename from spot/tests/ltl2ta2.test
rename to tests/ltl2ta2.test
diff --git a/spot/tests/ltl2tgba.test b/tests/ltl2tgba.test
similarity index 100%
rename from spot/tests/ltl2tgba.test
rename to tests/ltl2tgba.test
diff --git a/spot/tests/ltl3dra.test b/tests/ltl3dra.test
similarity index 100%
rename from spot/tests/ltl3dra.test
rename to tests/ltl3dra.test
diff --git a/spot/tests/ltlcounter.test b/tests/ltlcounter.test
similarity index 100%
rename from spot/tests/ltlcounter.test
rename to tests/ltlcounter.test
diff --git a/spot/tests/ltlcross.test b/tests/ltlcross.test
similarity index 100%
rename from spot/tests/ltlcross.test
rename to tests/ltlcross.test
diff --git a/spot/tests/ltlcross2.test b/tests/ltlcross2.test
similarity index 100%
rename from spot/tests/ltlcross2.test
rename to tests/ltlcross2.test
diff --git a/spot/tests/ltlcross3.test b/tests/ltlcross3.test
similarity index 100%
rename from spot/tests/ltlcross3.test
rename to tests/ltlcross3.test
diff --git a/spot/tests/ltlcross4.test b/tests/ltlcross4.test
similarity index 100%
rename from spot/tests/ltlcross4.test
rename to tests/ltlcross4.test
diff --git a/spot/tests/ltlcrossce.test b/tests/ltlcrossce.test
similarity index 100%
rename from spot/tests/ltlcrossce.test
rename to tests/ltlcrossce.test
diff --git a/spot/tests/ltlcrossce2.test b/tests/ltlcrossce2.test
similarity index 100%
rename from spot/tests/ltlcrossce2.test
rename to tests/ltlcrossce2.test
diff --git a/spot/tests/ltlcrossgrind.test b/tests/ltlcrossgrind.test
similarity index 100%
rename from spot/tests/ltlcrossgrind.test
rename to tests/ltlcrossgrind.test
diff --git a/spot/tests/ltldo.test b/tests/ltldo.test
similarity index 100%
rename from spot/tests/ltldo.test
rename to tests/ltldo.test
diff --git a/spot/tests/ltldo2.test b/tests/ltldo2.test
similarity index 100%
rename from spot/tests/ltldo2.test
rename to tests/ltldo2.test
diff --git a/spot/tests/ltlfilt.test b/tests/ltlfilt.test
similarity index 100%
rename from spot/tests/ltlfilt.test
rename to tests/ltlfilt.test
diff --git a/spot/tests/ltlgrind.test b/tests/ltlgrind.test
similarity index 100%
rename from spot/tests/ltlgrind.test
rename to tests/ltlgrind.test
diff --git a/spot/tests/ltlprod.cc b/tests/ltlprod.cc
similarity index 100%
rename from spot/tests/ltlprod.cc
rename to tests/ltlprod.cc
diff --git a/spot/tests/ltlprod.test b/tests/ltlprod.test
similarity index 100%
rename from spot/tests/ltlprod.test
rename to tests/ltlprod.test
diff --git a/spot/tests/ltlrel.cc b/tests/ltlrel.cc
similarity index 100%
rename from spot/tests/ltlrel.cc
rename to tests/ltlrel.cc
diff --git a/spot/tests/ltlrel.test b/tests/ltlrel.test
similarity index 100%
rename from spot/tests/ltlrel.test
rename to tests/ltlrel.test
diff --git a/spot/tests/lunabbrev.test b/tests/lunabbrev.test
similarity index 100%
rename from spot/tests/lunabbrev.test
rename to tests/lunabbrev.test
diff --git a/spot/tests/maskacc.test b/tests/maskacc.test
similarity index 100%
rename from spot/tests/maskacc.test
rename to tests/maskacc.test
diff --git a/spot/tests/maskkeep.test b/tests/maskkeep.test
similarity index 100%
rename from spot/tests/maskkeep.test
rename to tests/maskkeep.test
diff --git a/spot/tests/monitor.test b/tests/monitor.test
similarity index 100%
rename from spot/tests/monitor.test
rename to tests/monitor.test
diff --git a/spot/tests/nenoform.test b/tests/nenoform.test
similarity index 100%
rename from spot/tests/nenoform.test
rename to tests/nenoform.test
diff --git a/spot/tests/neverclaimread.test b/tests/neverclaimread.test
similarity index 100%
rename from spot/tests/neverclaimread.test
rename to tests/neverclaimread.test
diff --git a/spot/tests/ngraph.cc b/tests/ngraph.cc
similarity index 100%
rename from spot/tests/ngraph.cc
rename to tests/ngraph.cc
diff --git a/spot/tests/ngraph.test b/tests/ngraph.test
similarity index 100%
rename from spot/tests/ngraph.test
rename to tests/ngraph.test
diff --git a/spot/tests/nondet.test b/tests/nondet.test
similarity index 100%
rename from spot/tests/nondet.test
rename to tests/nondet.test
diff --git a/spot/tests/obligation.test b/tests/obligation.test
similarity index 100%
rename from spot/tests/obligation.test
rename to tests/obligation.test
diff --git a/spot/tests/optba.test b/tests/optba.test
similarity index 100%
rename from spot/tests/optba.test
rename to tests/optba.test
diff --git a/spot/tests/origin b/tests/origin
similarity index 100%
rename from spot/tests/origin
rename to tests/origin
diff --git a/spot/tests/parse.test b/tests/parse.test
similarity index 100%
rename from spot/tests/parse.test
rename to tests/parse.test
diff --git a/spot/tests/parse_print_test.cc b/tests/parse_print_test.cc
similarity index 100%
rename from spot/tests/parse_print_test.cc
rename to tests/parse_print_test.cc
diff --git a/spot/tests/parseaut.test b/tests/parseaut.test
similarity index 100%
rename from spot/tests/parseaut.test
rename to tests/parseaut.test
diff --git a/spot/tests/parseerr.test b/tests/parseerr.test
similarity index 100%
rename from spot/tests/parseerr.test
rename to tests/parseerr.test
diff --git a/spot/tests/prodor.test b/tests/prodor.test
similarity index 100%
rename from spot/tests/prodor.test
rename to tests/prodor.test
diff --git a/spot/tests/rand.test b/tests/rand.test
similarity index 100%
rename from spot/tests/rand.test
rename to tests/rand.test
diff --git a/spot/tests/randaut.test b/tests/randaut.test
similarity index 100%
rename from spot/tests/randaut.test
rename to tests/randaut.test
diff --git a/spot/tests/randomize.test b/tests/randomize.test
similarity index 100%
rename from spot/tests/randomize.test
rename to tests/randomize.test
diff --git a/spot/tests/randpsl.test b/tests/randpsl.test
similarity index 100%
rename from spot/tests/randpsl.test
rename to tests/randpsl.test
diff --git a/spot/tests/randtgba.cc b/tests/randtgba.cc
similarity index 100%
rename from spot/tests/randtgba.cc
rename to tests/randtgba.cc
diff --git a/spot/tests/randtgba.test b/tests/randtgba.test
similarity index 100%
rename from spot/tests/randtgba.test
rename to tests/randtgba.test
diff --git a/spot/tests/readltl.cc b/tests/readltl.cc
similarity index 100%
rename from spot/tests/readltl.cc
rename to tests/readltl.cc
diff --git a/spot/tests/readsat.cc b/tests/readsat.cc
similarity index 100%
rename from spot/tests/readsat.cc
rename to tests/readsat.cc
diff --git a/spot/tests/readsat.test b/tests/readsat.test
similarity index 100%
rename from spot/tests/readsat.test
rename to tests/readsat.test
diff --git a/spot/tests/readsave.test b/tests/readsave.test
similarity index 100%
rename from spot/tests/readsave.test
rename to tests/readsave.test
diff --git a/spot/tests/reduc.cc b/tests/reduc.cc
similarity index 100%
rename from spot/tests/reduc.cc
rename to tests/reduc.cc
diff --git a/spot/tests/reduc.test b/tests/reduc.test
similarity index 100%
rename from spot/tests/reduc.test
rename to tests/reduc.test
diff --git a/spot/tests/reduc0.test b/tests/reduc0.test
similarity index 100%
rename from spot/tests/reduc0.test
rename to tests/reduc0.test
diff --git a/spot/tests/reduccmp.test b/tests/reduccmp.test
similarity index 100%
rename from spot/tests/reduccmp.test
rename to tests/reduccmp.test
diff --git a/spot/tests/reducpsl.test b/tests/reducpsl.test
similarity index 100%
rename from spot/tests/reducpsl.test
rename to tests/reducpsl.test
diff --git a/spot/tests/remfin.test b/tests/remfin.test
similarity index 100%
rename from spot/tests/remfin.test
rename to tests/remfin.test
diff --git a/spot/tests/remove_x.test b/tests/remove_x.test
similarity index 100%
rename from spot/tests/remove_x.test
rename to tests/remove_x.test
diff --git a/spot/tests/remprop.test b/tests/remprop.test
similarity index 100%
rename from spot/tests/remprop.test
rename to tests/remprop.test
diff --git a/spot/tests/renault.test b/tests/renault.test
similarity index 100%
rename from spot/tests/renault.test
rename to tests/renault.test
diff --git a/spot/tests/satmin.test b/tests/satmin.test
similarity index 100%
rename from spot/tests/satmin.test
rename to tests/satmin.test
diff --git a/spot/tests/satmin2.test b/tests/satmin2.test
similarity index 100%
rename from spot/tests/satmin2.test
rename to tests/satmin2.test
diff --git a/spot/tests/sbacc.test b/tests/sbacc.test
similarity index 100%
rename from spot/tests/sbacc.test
rename to tests/sbacc.test
diff --git a/spot/tests/scc.test b/tests/scc.test
similarity index 100%
rename from spot/tests/scc.test
rename to tests/scc.test
diff --git a/spot/tests/sccdot.test b/tests/sccdot.test
similarity index 100%
rename from spot/tests/sccdot.test
rename to tests/sccdot.test
diff --git a/spot/tests/sccsimpl.test b/tests/sccsimpl.test
similarity index 100%
rename from spot/tests/sccsimpl.test
rename to tests/sccsimpl.test
diff --git a/spot/tests/sepsets.test b/tests/sepsets.test
similarity index 100%
rename from spot/tests/sepsets.test
rename to tests/sepsets.test
diff --git a/spot/tests/sim2.test b/tests/sim2.test
similarity index 100%
rename from spot/tests/sim2.test
rename to tests/sim2.test
diff --git a/spot/tests/sim3.test b/tests/sim3.test
similarity index 100%
rename from spot/tests/sim3.test
rename to tests/sim3.test
diff --git a/spot/tests/simdet.test b/tests/simdet.test
similarity index 100%
rename from spot/tests/simdet.test
rename to tests/simdet.test
diff --git a/spot/tests/spotlbtt.test b/tests/spotlbtt.test
similarity index 100%
rename from spot/tests/spotlbtt.test
rename to tests/spotlbtt.test
diff --git a/spot/tests/spotlbtt2.test b/tests/spotlbtt2.test
similarity index 100%
rename from spot/tests/spotlbtt2.test
rename to tests/spotlbtt2.test
diff --git a/spot/tests/strength.test b/tests/strength.test
similarity index 100%
rename from spot/tests/strength.test
rename to tests/strength.test
diff --git a/spot/tests/stutter-ltl.test b/tests/stutter-ltl.test
similarity index 100%
rename from spot/tests/stutter-ltl.test
rename to tests/stutter-ltl.test
diff --git a/spot/tests/stutter-tgba.test b/tests/stutter-tgba.test
similarity index 100%
rename from spot/tests/stutter-tgba.test
rename to tests/stutter-tgba.test
diff --git a/spot/tests/syntimpl.cc b/tests/syntimpl.cc
similarity index 100%
rename from spot/tests/syntimpl.cc
rename to tests/syntimpl.cc
diff --git a/spot/tests/syntimpl.test b/tests/syntimpl.test
similarity index 100%
rename from spot/tests/syntimpl.test
rename to tests/syntimpl.test
diff --git a/spot/tests/taatgba.cc b/tests/taatgba.cc
similarity index 100%
rename from spot/tests/taatgba.cc
rename to tests/taatgba.cc
diff --git a/spot/tests/taatgba.test b/tests/taatgba.test
similarity index 100%
rename from spot/tests/taatgba.test
rename to tests/taatgba.test
diff --git a/spot/tests/tgbagraph.test b/tests/tgbagraph.test
similarity index 100%
rename from spot/tests/tgbagraph.test
rename to tests/tgbagraph.test
diff --git a/spot/tests/tostring.cc b/tests/tostring.cc
similarity index 100%
rename from spot/tests/tostring.cc
rename to tests/tostring.cc
diff --git a/spot/tests/tostring.test b/tests/tostring.test
similarity index 100%
rename from spot/tests/tostring.test
rename to tests/tostring.test
diff --git a/spot/tests/tripprod.test b/tests/tripprod.test
similarity index 100%
rename from spot/tests/tripprod.test
rename to tests/tripprod.test
diff --git a/spot/tests/tunabbrev.test b/tests/tunabbrev.test
similarity index 100%
rename from spot/tests/tunabbrev.test
rename to tests/tunabbrev.test
diff --git a/spot/tests/tunenoform.test b/tests/tunenoform.test
similarity index 100%
rename from spot/tests/tunenoform.test
rename to tests/tunenoform.test
diff --git a/spot/tests/twagraph.cc b/tests/twagraph.cc
similarity index 100%
rename from spot/tests/twagraph.cc
rename to tests/twagraph.cc
diff --git a/spot/tests/unabbrevwm.test b/tests/unabbrevwm.test
similarity index 100%
rename from spot/tests/unabbrevwm.test
rename to tests/unabbrevwm.test
diff --git a/spot/tests/unambig.test b/tests/unambig.test
similarity index 100%
rename from spot/tests/unambig.test
rename to tests/unambig.test
diff --git a/spot/tests/uniq.test b/tests/uniq.test
similarity index 100%
rename from spot/tests/uniq.test
rename to tests/uniq.test
diff --git a/spot/tests/utf8.test b/tests/utf8.test
similarity index 100%
rename from spot/tests/utf8.test
rename to tests/utf8.test
diff --git a/spot/tests/uwrm.test b/tests/uwrm.test
similarity index 100%
rename from spot/tests/uwrm.test
rename to tests/uwrm.test
diff --git a/spot/tests/wdba.test b/tests/wdba.test
similarity index 100%
rename from spot/tests/wdba.test
rename to tests/wdba.test
diff --git a/spot/tests/wdba2.test b/tests/wdba2.test
similarity index 100%
rename from spot/tests/wdba2.test
rename to tests/wdba2.test