diff --git a/third_party/lua/testes/all.lua b/third_party/lua/test/all.lua
similarity index 99%
rename from third_party/lua/testes/all.lua
rename to third_party/lua/test/all.lua
index caec7177..ef1ef6ef 100644
--- a/third_party/lua/testes/all.lua
+++ b/third_party/lua/test/all.lua
@@ -1,5 +1,5 @@
 #!../lua
--- $Id: testes/all.lua $
+-- $Id: test/all.lua $
 -- See Copyright Notice at the end of this file
 
 
diff --git a/third_party/lua/testes/api.lua b/third_party/lua/test/api.lua
similarity index 99%
rename from third_party/lua/testes/api.lua
rename to third_party/lua/test/api.lua
index fb7e7085..86487acb 100644
--- a/third_party/lua/testes/api.lua
+++ b/third_party/lua/test/api.lua
@@ -1,4 +1,4 @@
--- $Id: testes/api.lua $
+-- $Id: test/api.lua $
 -- See Copyright Notice in file all.lua
 
 if T==nil then
diff --git a/third_party/lua/testes/attrib.lua b/third_party/lua/test/attrib.lua
similarity index 99%
rename from third_party/lua/testes/attrib.lua
rename to third_party/lua/test/attrib.lua
index b1076c76..fd598288 100644
--- a/third_party/lua/testes/attrib.lua
+++ b/third_party/lua/test/attrib.lua
@@ -1,4 +1,4 @@
--- $Id: testes/attrib.lua $
+-- $Id: test/attrib.lua $
 -- See Copyright Notice in file all.lua
 
 print "testing require"
diff --git a/third_party/lua/testes/big.lua b/third_party/lua/test/big.lua
similarity index 98%
rename from third_party/lua/testes/big.lua
rename to third_party/lua/test/big.lua
index 39e293ef..fcd2f5e9 100644
--- a/third_party/lua/testes/big.lua
+++ b/third_party/lua/test/big.lua
@@ -1,4 +1,4 @@
--- $Id: testes/big.lua $
+-- $Id: test/big.lua $
 -- See Copyright Notice in file all.lua
 
 if _soft then
diff --git a/third_party/lua/testes/bitwise.lua b/third_party/lua/test/bitwise.lua
similarity index 99%
rename from third_party/lua/testes/bitwise.lua
rename to third_party/lua/test/bitwise.lua
index 59781f5d..426ecce1 100644
--- a/third_party/lua/testes/bitwise.lua
+++ b/third_party/lua/test/bitwise.lua
@@ -1,4 +1,4 @@
--- $Id: testes/bitwise.lua $
+-- $Id: test/bitwise.lua $
 -- See Copyright Notice in file all.lua
 
 print("testing bitwise operations")
diff --git a/third_party/lua/testes/bwcoercion.lua b/third_party/lua/test/bwcoercion.lua
similarity index 100%
rename from third_party/lua/testes/bwcoercion.lua
rename to third_party/lua/test/bwcoercion.lua
diff --git a/third_party/lua/testes/calls.lua b/third_party/lua/test/calls.lua
similarity index 99%
rename from third_party/lua/testes/calls.lua
rename to third_party/lua/test/calls.lua
index ff72d8f6..5a16d521 100644
--- a/third_party/lua/testes/calls.lua
+++ b/third_party/lua/test/calls.lua
@@ -1,4 +1,4 @@
--- $Id: testes/calls.lua $
+-- $Id: test/calls.lua $
 -- See Copyright Notice in file all.lua
 
 print("testing functions and calls")
diff --git a/third_party/lua/testes/closure.lua b/third_party/lua/test/closure.lua
similarity index 99%
rename from third_party/lua/testes/closure.lua
rename to third_party/lua/test/closure.lua
index c2453677..81eb52da 100644
--- a/third_party/lua/testes/closure.lua
+++ b/third_party/lua/test/closure.lua
@@ -1,4 +1,4 @@
--- $Id: testes/closure.lua $
+-- $Id: test/closure.lua $
 -- See Copyright Notice in file all.lua
 
 print "testing closures"
diff --git a/third_party/lua/testes/code.lua b/third_party/lua/test/code.lua
similarity index 99%
rename from third_party/lua/testes/code.lua
rename to third_party/lua/test/code.lua
index 4e00309f..8cff521d 100644
--- a/third_party/lua/testes/code.lua
+++ b/third_party/lua/test/code.lua
@@ -1,4 +1,4 @@
--- $Id: testes/code.lua $
+-- $Id: test/code.lua $
 -- See Copyright Notice in file all.lua
 
 if T==nil then
diff --git a/third_party/lua/testes/constructs.lua b/third_party/lua/test/constructs.lua
similarity index 99%
rename from third_party/lua/testes/constructs.lua
rename to third_party/lua/test/constructs.lua
index a74a8c04..d6273dcf 100644
--- a/third_party/lua/testes/constructs.lua
+++ b/third_party/lua/test/constructs.lua
@@ -1,4 +1,4 @@
--- $Id: testes/constructs.lua $
+-- $Id: test/constructs.lua $
 -- See Copyright Notice in file all.lua
 
 ;;print "testing syntax";;
diff --git a/third_party/lua/testes/coroutine.lua b/third_party/lua/test/coroutine.lua
similarity index 99%
rename from third_party/lua/testes/coroutine.lua
rename to third_party/lua/test/coroutine.lua
index b36b76ea..fd8b0404 100644
--- a/third_party/lua/testes/coroutine.lua
+++ b/third_party/lua/test/coroutine.lua
@@ -1,4 +1,4 @@
--- $Id: testes/coroutine.lua $
+-- $Id: test/coroutine.lua $
 -- See Copyright Notice in file all.lua
 
 print "testing coroutines"
diff --git a/third_party/lua/testes/cstack.lua b/third_party/lua/test/cstack.lua
similarity index 99%
rename from third_party/lua/testes/cstack.lua
rename to third_party/lua/test/cstack.lua
index 7bd55063..39e2ee58 100644
--- a/third_party/lua/testes/cstack.lua
+++ b/third_party/lua/test/cstack.lua
@@ -1,4 +1,4 @@
--- $Id: testes/cstack.lua $
+-- $Id: test/cstack.lua $
 -- See Copyright Notice in file all.lua
 
 
diff --git a/third_party/lua/testes/db.lua b/third_party/lua/test/db.lua
similarity index 99%
rename from third_party/lua/testes/db.lua
rename to third_party/lua/test/db.lua
index d64952d9..e8e2a17c 100644
--- a/third_party/lua/testes/db.lua
+++ b/third_party/lua/test/db.lua
@@ -1,4 +1,4 @@
--- $Id: testes/db.lua $
+-- $Id: test/db.lua $
 -- See Copyright Notice in file all.lua
 
 -- testing debug library
diff --git a/third_party/lua/testes/errors.lua b/third_party/lua/test/errors.lua
similarity index 99%
rename from third_party/lua/testes/errors.lua
rename to third_party/lua/test/errors.lua
index 4249f570..7ae09f21 100644
--- a/third_party/lua/testes/errors.lua
+++ b/third_party/lua/test/errors.lua
@@ -1,4 +1,4 @@
--- $Id: testes/errors.lua $
+-- $Id: test/errors.lua $
 -- See Copyright Notice in file all.lua
 
 print("testing errors")
diff --git a/third_party/lua/testes/events.lua b/third_party/lua/test/events.lua
similarity index 99%
rename from third_party/lua/testes/events.lua
rename to third_party/lua/test/events.lua
index 17a73664..71dee459 100644
--- a/third_party/lua/testes/events.lua
+++ b/third_party/lua/test/events.lua
@@ -1,4 +1,4 @@
--- $Id: testes/events.lua $
+-- $Id: test/events.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing metatables')
diff --git a/third_party/lua/testes/files.lua b/third_party/lua/test/files.lua
similarity index 99%
rename from third_party/lua/testes/files.lua
rename to third_party/lua/test/files.lua
index 06b69bc2..7302f015 100644
--- a/third_party/lua/testes/files.lua
+++ b/third_party/lua/test/files.lua
@@ -1,4 +1,4 @@
--- $Id: testes/files.lua $
+-- $Id: test/files.lua $
 -- See Copyright Notice in file all.lua
 
 local debug = require "debug"
diff --git a/third_party/lua/testes/gc.lua b/third_party/lua/test/gc.lua
similarity index 99%
rename from third_party/lua/testes/gc.lua
rename to third_party/lua/test/gc.lua
index 80850f92..301af51b 100644
--- a/third_party/lua/testes/gc.lua
+++ b/third_party/lua/test/gc.lua
@@ -1,4 +1,4 @@
--- $Id: testes/gc.lua $
+-- $Id: test/gc.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing incremental garbage collection')
diff --git a/third_party/lua/testes/gengc.lua b/third_party/lua/test/gengc.lua
similarity index 99%
rename from third_party/lua/testes/gengc.lua
rename to third_party/lua/test/gengc.lua
index 3d4f67f8..b0966c92 100644
--- a/third_party/lua/testes/gengc.lua
+++ b/third_party/lua/test/gengc.lua
@@ -1,4 +1,4 @@
--- $Id: testes/gengc.lua $
+-- $Id: test/gengc.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing generational garbage collection')
diff --git a/third_party/lua/testes/goto.lua b/third_party/lua/test/goto.lua
similarity index 99%
rename from third_party/lua/testes/goto.lua
rename to third_party/lua/test/goto.lua
index 4ac6d7d0..07a791bf 100644
--- a/third_party/lua/testes/goto.lua
+++ b/third_party/lua/test/goto.lua
@@ -1,4 +1,4 @@
--- $Id: testes/goto.lua $
+-- $Id: test/goto.lua $
 -- See Copyright Notice in file all.lua
 
 collectgarbage()
diff --git a/third_party/lua/testes/heavy.lua b/third_party/lua/test/heavy.lua
similarity index 100%
rename from third_party/lua/testes/heavy.lua
rename to third_party/lua/test/heavy.lua
diff --git a/third_party/lua/testes/libs/P1/dummy b/third_party/lua/test/libs/P1/dummy
similarity index 100%
rename from third_party/lua/testes/libs/P1/dummy
rename to third_party/lua/test/libs/P1/dummy
diff --git a/third_party/lua/testes/libs/lib1.c b/third_party/lua/test/libs/lib1.c
similarity index 100%
rename from third_party/lua/testes/libs/lib1.c
rename to third_party/lua/test/libs/lib1.c
diff --git a/third_party/lua/testes/libs/lib11.c b/third_party/lua/test/libs/lib11.c
similarity index 100%
rename from third_party/lua/testes/libs/lib11.c
rename to third_party/lua/test/libs/lib11.c
diff --git a/third_party/lua/testes/libs/lib2.c b/third_party/lua/test/libs/lib2.c
similarity index 100%
rename from third_party/lua/testes/libs/lib2.c
rename to third_party/lua/test/libs/lib2.c
diff --git a/third_party/lua/testes/libs/lib21.c b/third_party/lua/test/libs/lib21.c
similarity index 100%
rename from third_party/lua/testes/libs/lib21.c
rename to third_party/lua/test/libs/lib21.c
diff --git a/third_party/lua/testes/libs/lib22.c b/third_party/lua/test/libs/lib22.c
similarity index 100%
rename from third_party/lua/testes/libs/lib22.c
rename to third_party/lua/test/libs/lib22.c
diff --git a/third_party/lua/testes/libs/makefile b/third_party/lua/test/libs/makefile
similarity index 100%
rename from third_party/lua/testes/libs/makefile
rename to third_party/lua/test/libs/makefile
diff --git a/third_party/lua/testes/literals.lua b/third_party/lua/test/literals.lua
similarity index 99%
rename from third_party/lua/testes/literals.lua
rename to third_party/lua/test/literals.lua
index e101eabf..c6dbf76a 100644
--- a/third_party/lua/testes/literals.lua
+++ b/third_party/lua/test/literals.lua
@@ -1,4 +1,4 @@
--- $Id: testes/literals.lua $
+-- $Id: test/literals.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing scanner')
diff --git a/third_party/lua/testes/locals.lua b/third_party/lua/test/locals.lua
similarity index 99%
rename from third_party/lua/testes/locals.lua
rename to third_party/lua/test/locals.lua
index a93839db..6336e51f 100644
--- a/third_party/lua/testes/locals.lua
+++ b/third_party/lua/test/locals.lua
@@ -1,4 +1,4 @@
--- $Id: testes/locals.lua $
+-- $Id: test/locals.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing local variables and environments')
diff --git a/third_party/lua/testes/main.lua b/third_party/lua/test/main.lua
similarity index 99%
rename from third_party/lua/testes/main.lua
rename to third_party/lua/test/main.lua
index 164902f9..371fa7d1 100644
--- a/third_party/lua/testes/main.lua
+++ b/third_party/lua/test/main.lua
@@ -1,5 +1,5 @@
 # testing special comment on first line
--- $Id: testes/main.lua $
+-- $Id: test/main.lua $
 -- See Copyright Notice in file all.lua
 
 -- most (all?) tests here assume a reasonable "Unix-like" shell
diff --git a/third_party/lua/testes/math.lua b/third_party/lua/test/math.lua
similarity index 99%
rename from third_party/lua/testes/math.lua
rename to third_party/lua/test/math.lua
index 930221e3..a2af3fca 100644
--- a/third_party/lua/testes/math.lua
+++ b/third_party/lua/test/math.lua
@@ -1,4 +1,4 @@
--- $Id: testes/math.lua $
+-- $Id: test/math.lua $
 -- See Copyright Notice in file all.lua
 
 print("testing numbers and math lib")
diff --git a/third_party/lua/testes/nextvar.lua b/third_party/lua/test/nextvar.lua
similarity index 99%
rename from third_party/lua/testes/nextvar.lua
rename to third_party/lua/test/nextvar.lua
index 29cb05d5..8b39dc6f 100644
--- a/third_party/lua/testes/nextvar.lua
+++ b/third_party/lua/test/nextvar.lua
@@ -1,4 +1,4 @@
--- $Id: testes/nextvar.lua $
+-- $Id: test/nextvar.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing tables, next, and for')
diff --git a/third_party/lua/testes/packtests b/third_party/lua/test/packtests
similarity index 100%
rename from third_party/lua/testes/packtests
rename to third_party/lua/test/packtests
diff --git a/third_party/lua/testes/pm.lua b/third_party/lua/test/pm.lua
similarity index 99%
rename from third_party/lua/testes/pm.lua
rename to third_party/lua/test/pm.lua
index 94bb63ca..7b38fd6c 100644
--- a/third_party/lua/testes/pm.lua
+++ b/third_party/lua/test/pm.lua
@@ -1,4 +1,4 @@
--- $Id: testes/pm.lua $
+-- $Id: test/pm.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing pattern matching')
diff --git a/third_party/lua/testes/sort.lua b/third_party/lua/test/sort.lua
similarity index 99%
rename from third_party/lua/testes/sort.lua
rename to third_party/lua/test/sort.lua
index ef405d92..7c8c484e 100644
--- a/third_party/lua/testes/sort.lua
+++ b/third_party/lua/test/sort.lua
@@ -1,4 +1,4 @@
--- $Id: testes/sort.lua $
+-- $Id: test/sort.lua $
 -- See Copyright Notice in file all.lua
 
 print "testing (parts of) table library"
diff --git a/third_party/lua/testes/strings.lua b/third_party/lua/test/strings.lua
similarity index 99%
rename from third_party/lua/testes/strings.lua
rename to third_party/lua/test/strings.lua
index 61a06a25..bb85ebcd 100644
--- a/third_party/lua/testes/strings.lua
+++ b/third_party/lua/test/strings.lua
@@ -1,4 +1,4 @@
--- $Id: testes/strings.lua $
+-- $Id: test/strings.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing strings and string library')
diff --git a/third_party/lua/testes/tpack.lua b/third_party/lua/test/tpack.lua
similarity index 99%
rename from third_party/lua/testes/tpack.lua
rename to third_party/lua/test/tpack.lua
index 2b9953f8..d3c4efe0 100644
--- a/third_party/lua/testes/tpack.lua
+++ b/third_party/lua/test/tpack.lua
@@ -1,4 +1,4 @@
--- $Id: testes/tpack.lua $
+-- $Id: test/tpack.lua $
 -- See Copyright Notice in file all.lua
 
 local pack = string.pack
diff --git a/third_party/lua/testes/utf8.lua b/third_party/lua/test/utf8.lua
similarity index 99%
rename from third_party/lua/testes/utf8.lua
rename to third_party/lua/test/utf8.lua
index 6010d1ad..07896608 100644
--- a/third_party/lua/testes/utf8.lua
+++ b/third_party/lua/test/utf8.lua
@@ -1,4 +1,4 @@
--- $Id: testes/utf8.lua $
+-- $Id: test/utf8.lua $
 -- See Copyright Notice in file all.lua
 
 print "testing UTF-8 library"
diff --git a/third_party/lua/testes/vararg.lua b/third_party/lua/test/vararg.lua
similarity index 99%
rename from third_party/lua/testes/vararg.lua
rename to third_party/lua/test/vararg.lua
index 44848d25..9cfada5e 100644
--- a/third_party/lua/testes/vararg.lua
+++ b/third_party/lua/test/vararg.lua
@@ -1,4 +1,4 @@
--- $Id: testes/vararg.lua $
+-- $Id: test/vararg.lua $
 -- See Copyright Notice in file all.lua
 
 print('testing vararg')
diff --git a/third_party/lua/testes/verybig.lua b/third_party/lua/test/verybig.lua
similarity index 99%
rename from third_party/lua/testes/verybig.lua
rename to third_party/lua/test/verybig.lua
index 8fb7b13e..2779b814 100644
--- a/third_party/lua/testes/verybig.lua
+++ b/third_party/lua/test/verybig.lua
@@ -1,4 +1,4 @@
--- $Id: testes/verybig.lua $
+-- $Id: test/verybig.lua $
 -- See Copyright Notice in file all.lua
 
 print "testing RK"