diff --git a/README b/README
index cf06a423f..2bfc77aae 100644
--- a/README
+++ b/README
@@ -153,7 +153,7 @@ src/              Sources for libspot.
    priv/          Private algorithms, used internally but not exported.
    ta/            TA objects and cousins (TGTA).
    taalgos/       Algorithms on TA/TGTA.
-   tgbatest/      Tests for twa/, twaalgos/, ta/ and taalgos/.
+   tests/      	  Tests for twa/, twaalgos/, ta/ and taalgos/.
    twa/           TωA objects and cousins (Transition-based ω-Automata).
    twaalgos/      Algorithms on TωA.
       gtec/       Couvreur's Emptiness-Check.
@@ -203,7 +203,7 @@ End:
  LocalWords:  Python's BuDDy LBTT LTL Büchi lbtt gspn DIR GreatSPN Soheib Yann
  LocalWords:  Baarir Thierry Mieg CVS Università di Torino devel src libspot ac
  LocalWords:  ltlast ltlenv ltlparse ltlvisit ltltest misc tgba TGBA tgbaalgos
- LocalWords:  gtec Tarjan tgbatest doc html PDF spotref pdf cgi ELTL
+ LocalWords:  gtec Tarjan doc html PDF spotref pdf cgi ELTL
  LocalWords:  CGI ltl iface BDD Couvreur's emptchk kripke Kripke saba vm
  LocalWords:  eltlparse eltltest SABA sabaalgos sabatest ssp ltlcouter scc SCC
 LocalWords:  formulae optimizations kripkeparse kripketest Automata
diff --git a/configure.ac b/configure.ac
index bc02e8d35..b5284a858 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,8 +222,8 @@ AC_CONFIG_FILES([
   src/twa/Makefile
   src/taalgos/Makefile
   src/ta/Makefile
-  src/tgbatest/defs
-  src/tgbatest/Makefile
+  src/tests/defs
+  src/tests/Makefile
   wrap/Makefile
   wrap/python/Makefile
   wrap/python/ajax/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index ccfa8a572..f2bf0cf3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 # libspot.la needed by the tests)
 SUBDIRS = misc priv ltlenv ltlast ltlvisit ltlparse graph twa		\
           twaalgos ta taalgos kripke kripkeparse dstarparse hoaparse	\
-          . bin ltltest graphtest tgbatest kripketest sanity
+          . bin ltltest graphtest tests kripketest sanity
 
 lib_LTLIBRARIES = libspot.la
 libspot_la_SOURCES =
diff --git a/src/tgbatest/.cvsignore b/src/tests/.cvsignore
similarity index 100%
rename from src/tgbatest/.cvsignore
rename to src/tests/.cvsignore
diff --git a/src/tgbatest/.gitignore b/src/tests/.gitignore
similarity index 100%
rename from src/tgbatest/.gitignore
rename to src/tests/.gitignore
diff --git a/src/tgbatest/Makefile.am b/src/tests/Makefile.am
similarity index 98%
rename from src/tgbatest/Makefile.am
rename to src/tests/Makefile.am
index 5234d545c..285be2ef2 100644
--- a/src/tgbatest/Makefile.am
+++ b/src/tests/Makefile.am
@@ -60,7 +60,9 @@ taatgba_SOURCES = taatgba.cc
 
 # Keep this sorted by STRENGTH.  Test basic things first,
 # because such failures will be easier to diagnose and fix.
-TESTS = \
+TESTS = $(TESTS_twa)
+
+TESTS_twa = \
   acc.test \
   acc2.test \
   intvcomp.test \
diff --git a/src/tgbatest/acc.cc b/src/tests/acc.cc
similarity index 100%
rename from src/tgbatest/acc.cc
rename to src/tests/acc.cc
diff --git a/src/tgbatest/acc.test b/src/tests/acc.test
similarity index 100%
rename from src/tgbatest/acc.test
rename to src/tests/acc.test
diff --git a/src/tgbatest/acc2.test b/src/tests/acc2.test
similarity index 100%
rename from src/tgbatest/acc2.test
rename to src/tests/acc2.test
diff --git a/src/tgbatest/babiak.test b/src/tests/babiak.test
similarity index 100%
rename from src/tgbatest/babiak.test
rename to src/tests/babiak.test
diff --git a/src/tgbatest/basimul.test b/src/tests/basimul.test
similarity index 100%
rename from src/tgbatest/basimul.test
rename to src/tests/basimul.test
diff --git a/src/tgbatest/bitvect.cc b/src/tests/bitvect.cc
similarity index 100%
rename from src/tgbatest/bitvect.cc
rename to src/tests/bitvect.cc
diff --git a/src/tgbatest/bitvect.test b/src/tests/bitvect.test
similarity index 100%
rename from src/tgbatest/bitvect.test
rename to src/tests/bitvect.test
diff --git a/src/tgbatest/checkpsl.cc b/src/tests/checkpsl.cc
similarity index 100%
rename from src/tgbatest/checkpsl.cc
rename to src/tests/checkpsl.cc
diff --git a/src/tgbatest/checkta.cc b/src/tests/checkta.cc
similarity index 100%
rename from src/tgbatest/checkta.cc
rename to src/tests/checkta.cc
diff --git a/src/tgbatest/complementation.cc b/src/tests/complementation.cc
similarity index 100%
rename from src/tgbatest/complementation.cc
rename to src/tests/complementation.cc
diff --git a/src/tgbatest/complementation.test b/src/tests/complementation.test
similarity index 100%
rename from src/tgbatest/complementation.test
rename to src/tests/complementation.test
diff --git a/src/tgbatest/complete.test b/src/tests/complete.test
similarity index 100%
rename from src/tgbatest/complete.test
rename to src/tests/complete.test
diff --git a/src/tgbatest/cycles.test b/src/tests/cycles.test
similarity index 100%
rename from src/tgbatest/cycles.test
rename to src/tests/cycles.test
diff --git a/src/tgbatest/dbacomp.test b/src/tests/dbacomp.test
similarity index 100%
rename from src/tgbatest/dbacomp.test
rename to src/tests/dbacomp.test
diff --git a/src/tgbatest/defs.in b/src/tests/defs.in
similarity index 100%
rename from src/tgbatest/defs.in
rename to src/tests/defs.in
diff --git a/src/tgbatest/degendet.test b/src/tests/degendet.test
similarity index 100%
rename from src/tgbatest/degendet.test
rename to src/tests/degendet.test
diff --git a/src/tgbatest/degenid.test b/src/tests/degenid.test
similarity index 100%
rename from src/tgbatest/degenid.test
rename to src/tests/degenid.test
diff --git a/src/tgbatest/degenlskip.test b/src/tests/degenlskip.test
similarity index 100%
rename from src/tgbatest/degenlskip.test
rename to src/tests/degenlskip.test
diff --git a/src/tgbatest/det.test b/src/tests/det.test
similarity index 100%
rename from src/tgbatest/det.test
rename to src/tests/det.test
diff --git a/src/tgbatest/dfs.test b/src/tests/dfs.test
similarity index 100%
rename from src/tgbatest/dfs.test
rename to src/tests/dfs.test
diff --git a/src/tgbatest/dra2dba.test b/src/tests/dra2dba.test
similarity index 100%
rename from src/tgbatest/dra2dba.test
rename to src/tests/dra2dba.test
diff --git a/src/tgbatest/dstar.test b/src/tests/dstar.test
similarity index 100%
rename from src/tgbatest/dstar.test
rename to src/tests/dstar.test
diff --git a/src/tgbatest/dupexp.test b/src/tests/dupexp.test
similarity index 100%
rename from src/tgbatest/dupexp.test
rename to src/tests/dupexp.test
diff --git a/src/tgbatest/emptchk.cc b/src/tests/emptchk.cc
similarity index 100%
rename from src/tgbatest/emptchk.cc
rename to src/tests/emptchk.cc
diff --git a/src/tgbatest/emptchk.test b/src/tests/emptchk.test
similarity index 100%
rename from src/tgbatest/emptchk.test
rename to src/tests/emptchk.test
diff --git a/src/tgbatest/emptchke.test b/src/tests/emptchke.test
similarity index 100%
rename from src/tgbatest/emptchke.test
rename to src/tests/emptchke.test
diff --git a/src/tgbatest/emptchkr.test b/src/tests/emptchkr.test
similarity index 100%
rename from src/tgbatest/emptchkr.test
rename to src/tests/emptchkr.test
diff --git a/src/tgbatest/exclusive-tgba.test b/src/tests/exclusive-tgba.test
similarity index 100%
rename from src/tgbatest/exclusive-tgba.test
rename to src/tests/exclusive-tgba.test
diff --git a/src/tgbatest/explpro2.test b/src/tests/explpro2.test
similarity index 100%
rename from src/tgbatest/explpro2.test
rename to src/tests/explpro2.test
diff --git a/src/tgbatest/explpro3.test b/src/tests/explpro3.test
similarity index 100%
rename from src/tgbatest/explpro3.test
rename to src/tests/explpro3.test
diff --git a/src/tgbatest/explpro4.test b/src/tests/explpro4.test
similarity index 100%
rename from src/tgbatest/explpro4.test
rename to src/tests/explpro4.test
diff --git a/src/tgbatest/explprod.test b/src/tests/explprod.test
similarity index 100%
rename from src/tgbatest/explprod.test
rename to src/tests/explprod.test
diff --git a/src/tgbatest/hoaparse.test b/src/tests/hoaparse.test
similarity index 100%
rename from src/tgbatest/hoaparse.test
rename to src/tests/hoaparse.test
diff --git a/src/tgbatest/intvcmp2.cc b/src/tests/intvcmp2.cc
similarity index 100%
rename from src/tgbatest/intvcmp2.cc
rename to src/tests/intvcmp2.cc
diff --git a/src/tgbatest/intvcomp.cc b/src/tests/intvcomp.cc
similarity index 100%
rename from src/tgbatest/intvcomp.cc
rename to src/tests/intvcomp.cc
diff --git a/src/tgbatest/intvcomp.test b/src/tests/intvcomp.test
similarity index 100%
rename from src/tgbatest/intvcomp.test
rename to src/tests/intvcomp.test
diff --git a/src/tgbatest/isomorph.test b/src/tests/isomorph.test
similarity index 100%
rename from src/tgbatest/isomorph.test
rename to src/tests/isomorph.test
diff --git a/src/tgbatest/kv.test b/src/tests/kv.test
similarity index 100%
rename from src/tgbatest/kv.test
rename to src/tests/kv.test
diff --git a/src/tgbatest/lbttparse.test b/src/tests/lbttparse.test
similarity index 100%
rename from src/tgbatest/lbttparse.test
rename to src/tests/lbttparse.test
diff --git a/src/tgbatest/ltl2dstar.test b/src/tests/ltl2dstar.test
similarity index 100%
rename from src/tgbatest/ltl2dstar.test
rename to src/tests/ltl2dstar.test
diff --git a/src/tgbatest/ltl2dstar2.test b/src/tests/ltl2dstar2.test
similarity index 100%
rename from src/tgbatest/ltl2dstar2.test
rename to src/tests/ltl2dstar2.test
diff --git a/src/tgbatest/ltl2dstar3.test b/src/tests/ltl2dstar3.test
similarity index 100%
rename from src/tgbatest/ltl2dstar3.test
rename to src/tests/ltl2dstar3.test
diff --git a/src/tgbatest/ltl2neverclaim-lbtt.test b/src/tests/ltl2neverclaim-lbtt.test
similarity index 100%
rename from src/tgbatest/ltl2neverclaim-lbtt.test
rename to src/tests/ltl2neverclaim-lbtt.test
diff --git a/src/tgbatest/ltl2neverclaim.test b/src/tests/ltl2neverclaim.test
similarity index 100%
rename from src/tgbatest/ltl2neverclaim.test
rename to src/tests/ltl2neverclaim.test
diff --git a/src/tgbatest/ltl2ta.test b/src/tests/ltl2ta.test
similarity index 100%
rename from src/tgbatest/ltl2ta.test
rename to src/tests/ltl2ta.test
diff --git a/src/tgbatest/ltl2ta2.test b/src/tests/ltl2ta2.test
similarity index 100%
rename from src/tgbatest/ltl2ta2.test
rename to src/tests/ltl2ta2.test
diff --git a/src/tgbatest/ltl2tgba.cc b/src/tests/ltl2tgba.cc
similarity index 100%
rename from src/tgbatest/ltl2tgba.cc
rename to src/tests/ltl2tgba.cc
diff --git a/src/tgbatest/ltl2tgba.test b/src/tests/ltl2tgba.test
similarity index 100%
rename from src/tgbatest/ltl2tgba.test
rename to src/tests/ltl2tgba.test
diff --git a/src/tgbatest/ltlcounter.test b/src/tests/ltlcounter.test
similarity index 100%
rename from src/tgbatest/ltlcounter.test
rename to src/tests/ltlcounter.test
diff --git a/src/tgbatest/ltlcross.test b/src/tests/ltlcross.test
similarity index 100%
rename from src/tgbatest/ltlcross.test
rename to src/tests/ltlcross.test
diff --git a/src/tgbatest/ltlcross2.test b/src/tests/ltlcross2.test
similarity index 100%
rename from src/tgbatest/ltlcross2.test
rename to src/tests/ltlcross2.test
diff --git a/src/tgbatest/ltlcross3.test b/src/tests/ltlcross3.test
similarity index 100%
rename from src/tgbatest/ltlcross3.test
rename to src/tests/ltlcross3.test
diff --git a/src/tgbatest/ltlcross4.test b/src/tests/ltlcross4.test
similarity index 100%
rename from src/tgbatest/ltlcross4.test
rename to src/tests/ltlcross4.test
diff --git a/src/tgbatest/ltlcrossce.test b/src/tests/ltlcrossce.test
similarity index 100%
rename from src/tgbatest/ltlcrossce.test
rename to src/tests/ltlcrossce.test
diff --git a/src/tgbatest/ltlcrossce2.test b/src/tests/ltlcrossce2.test
similarity index 100%
rename from src/tgbatest/ltlcrossce2.test
rename to src/tests/ltlcrossce2.test
diff --git a/src/tgbatest/ltldo.test b/src/tests/ltldo.test
similarity index 100%
rename from src/tgbatest/ltldo.test
rename to src/tests/ltldo.test
diff --git a/src/tgbatest/ltldo2.test b/src/tests/ltldo2.test
similarity index 100%
rename from src/tgbatest/ltldo2.test
rename to src/tests/ltldo2.test
diff --git a/src/tgbatest/ltlprod.cc b/src/tests/ltlprod.cc
similarity index 100%
rename from src/tgbatest/ltlprod.cc
rename to src/tests/ltlprod.cc
diff --git a/src/tgbatest/ltlprod.test b/src/tests/ltlprod.test
similarity index 100%
rename from src/tgbatest/ltlprod.test
rename to src/tests/ltlprod.test
diff --git a/src/tgbatest/maskacc.test b/src/tests/maskacc.test
similarity index 100%
rename from src/tgbatest/maskacc.test
rename to src/tests/maskacc.test
diff --git a/src/tgbatest/maskkeep.test b/src/tests/maskkeep.test
similarity index 100%
rename from src/tgbatest/maskkeep.test
rename to src/tests/maskkeep.test
diff --git a/src/tgbatest/monitor.test b/src/tests/monitor.test
similarity index 100%
rename from src/tgbatest/monitor.test
rename to src/tests/monitor.test
diff --git a/src/tgbatest/neverclaimread.test b/src/tests/neverclaimread.test
similarity index 100%
rename from src/tgbatest/neverclaimread.test
rename to src/tests/neverclaimread.test
diff --git a/src/tgbatest/nondet.test b/src/tests/nondet.test
similarity index 100%
rename from src/tgbatest/nondet.test
rename to src/tests/nondet.test
diff --git a/src/tgbatest/obligation.test b/src/tests/obligation.test
similarity index 100%
rename from src/tgbatest/obligation.test
rename to src/tests/obligation.test
diff --git a/src/tgbatest/randaut.test b/src/tests/randaut.test
similarity index 100%
rename from src/tgbatest/randaut.test
rename to src/tests/randaut.test
diff --git a/src/tgbatest/randomize.test b/src/tests/randomize.test
similarity index 100%
rename from src/tgbatest/randomize.test
rename to src/tests/randomize.test
diff --git a/src/tgbatest/randpsl.test b/src/tests/randpsl.test
similarity index 100%
rename from src/tgbatest/randpsl.test
rename to src/tests/randpsl.test
diff --git a/src/tgbatest/randtgba.cc b/src/tests/randtgba.cc
similarity index 100%
rename from src/tgbatest/randtgba.cc
rename to src/tests/randtgba.cc
diff --git a/src/tgbatest/randtgba.test b/src/tests/randtgba.test
similarity index 100%
rename from src/tgbatest/randtgba.test
rename to src/tests/randtgba.test
diff --git a/src/tgbatest/readsat.cc b/src/tests/readsat.cc
similarity index 100%
rename from src/tgbatest/readsat.cc
rename to src/tests/readsat.cc
diff --git a/src/tgbatest/readsat.test b/src/tests/readsat.test
similarity index 100%
rename from src/tgbatest/readsat.test
rename to src/tests/readsat.test
diff --git a/src/tgbatest/readsave.test b/src/tests/readsave.test
similarity index 100%
rename from src/tgbatest/readsave.test
rename to src/tests/readsave.test
diff --git a/src/tgbatest/remfin.test b/src/tests/remfin.test
similarity index 100%
rename from src/tgbatest/remfin.test
rename to src/tests/remfin.test
diff --git a/src/tgbatest/remprop.test b/src/tests/remprop.test
similarity index 100%
rename from src/tgbatest/remprop.test
rename to src/tests/remprop.test
diff --git a/src/tgbatest/renault.test b/src/tests/renault.test
similarity index 100%
rename from src/tgbatest/renault.test
rename to src/tests/renault.test
diff --git a/src/tgbatest/satmin.test b/src/tests/satmin.test
similarity index 100%
rename from src/tgbatest/satmin.test
rename to src/tests/satmin.test
diff --git a/src/tgbatest/satmin2.test b/src/tests/satmin2.test
similarity index 100%
rename from src/tgbatest/satmin2.test
rename to src/tests/satmin2.test
diff --git a/src/tgbatest/sbacc.test b/src/tests/sbacc.test
similarity index 100%
rename from src/tgbatest/sbacc.test
rename to src/tests/sbacc.test
diff --git a/src/tgbatest/scc.test b/src/tests/scc.test
similarity index 100%
rename from src/tgbatest/scc.test
rename to src/tests/scc.test
diff --git a/src/tgbatest/sccdot.test b/src/tests/sccdot.test
similarity index 100%
rename from src/tgbatest/sccdot.test
rename to src/tests/sccdot.test
diff --git a/src/tgbatest/sccsimpl.test b/src/tests/sccsimpl.test
similarity index 100%
rename from src/tgbatest/sccsimpl.test
rename to src/tests/sccsimpl.test
diff --git a/src/tgbatest/sim2.test b/src/tests/sim2.test
similarity index 100%
rename from src/tgbatest/sim2.test
rename to src/tests/sim2.test
diff --git a/src/tgbatest/simdet.test b/src/tests/simdet.test
similarity index 100%
rename from src/tgbatest/simdet.test
rename to src/tests/simdet.test
diff --git a/src/tgbatest/spotlbtt.test b/src/tests/spotlbtt.test
similarity index 100%
rename from src/tgbatest/spotlbtt.test
rename to src/tests/spotlbtt.test
diff --git a/src/tgbatest/spotlbtt2.test b/src/tests/spotlbtt2.test
similarity index 100%
rename from src/tgbatest/spotlbtt2.test
rename to src/tests/spotlbtt2.test
diff --git a/src/tgbatest/stutter-tgba.test b/src/tests/stutter-tgba.test
similarity index 100%
rename from src/tgbatest/stutter-tgba.test
rename to src/tests/stutter-tgba.test
diff --git a/src/tgbatest/taatgba.cc b/src/tests/taatgba.cc
similarity index 100%
rename from src/tgbatest/taatgba.cc
rename to src/tests/taatgba.cc
diff --git a/src/tgbatest/taatgba.test b/src/tests/taatgba.test
similarity index 100%
rename from src/tgbatest/taatgba.test
rename to src/tests/taatgba.test
diff --git a/src/tgbatest/tripprod.test b/src/tests/tripprod.test
similarity index 100%
rename from src/tgbatest/tripprod.test
rename to src/tests/tripprod.test
diff --git a/src/tgbatest/uniq.test b/src/tests/uniq.test
similarity index 100%
rename from src/tgbatest/uniq.test
rename to src/tests/uniq.test
diff --git a/src/tgbatest/wdba.test b/src/tests/wdba.test
similarity index 100%
rename from src/tgbatest/wdba.test
rename to src/tests/wdba.test
diff --git a/src/tgbatest/wdba2.test b/src/tests/wdba2.test
similarity index 100%
rename from src/tgbatest/wdba2.test
rename to src/tests/wdba2.test