diff --git a/luaj-test/src/test/resources/errors/debuglibargs.lua b/luaj-test/src/test/resources/errors/debuglibargs.lua
index 085a077a..7937e577 100644
--- a/luaj-test/src/test/resources/errors/debuglibargs.lua
+++ b/luaj-test/src/test/resources/errors/debuglibargs.lua
@@ -149,5 +149,15 @@ checkallpass('debug.upvaluejoin',{{f},{1,'2'},{f},{1,'2'}})
 checkallerrors('debug.upvaluejoin',{},'number expected')
 checkallerrors('debug.upvaluejoin',{notafunction,{1,'2'}}, 'function expected')
 checkallerrors('debug.upvaluejoin',{{f},notanumber}, 'number expected')
+checkallerrors('debug.upvaluejoin',{notafunction,{1},{f},{1}}, 'function expected')
+checkallerrors('debug.upvaluejoin',{{f},notanumber,{f},{1}}, 'number expected')
 checkallerrors('debug.upvaluejoin',{{f},{1},notafunction,{1,'2'}}, 'function expected')
 checkallerrors('debug.upvaluejoin',{{f},{1},{f},notanumber}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{1},{f},{f},{1}}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{f},{f},{1},{1}}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{f},{1},{1},{f}}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{f},{f},{1},{f}}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{1},{1},{1},{f}}, 'function expected')
+checkallerrors('debug.upvaluejoin',{{1},{f},{f},{f}}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{1},{f},{1},{1}}, 'number expected')
+checkallerrors('debug.upvaluejoin',{{1},{f},{1},{f}}, 'number expected')
diff --git a/luaj-test/src/test/resources/errors/jse/debuglibargs.out b/luaj-test/src/test/resources/errors/jse/debuglibargs.out
index b33023ac..94fe9d3b 100644
--- a/luaj-test/src/test/resources/errors/jse/debuglibargs.out
+++ b/luaj-test/src/test/resources/errors/jse/debuglibargs.out
@@ -488,6 +488,20 @@ stack traceback:
 -		debug.upvaluejoin(<function>,<function>)	...number expected...
 -		debug.upvaluejoin(<function>,<thread>)	...number expected...
 --- checkallerrors
+-		debug.upvaluejoin(nil,1,<function>,1)	...function expected...
+-		debug.upvaluejoin('abc',1,<function>,1)	...function expected...
+-		debug.upvaluejoin(1.25,1,<function>,1)	...function expected...
+-		debug.upvaluejoin(true,1,<function>,1)	...function expected...
+-		debug.upvaluejoin(<table>,1,<function>,1)	...function expected...
+-		debug.upvaluejoin(<thread>,1,<function>,1)	...function expected...
+--- checkallerrors
+-		debug.upvaluejoin(<function>,nil,<function>,1)	...number expected...
+-		debug.upvaluejoin(<function>,'abc',<function>,1)	...number expected...
+-		debug.upvaluejoin(<function>,true,<function>,1)	...number expected...
+-		debug.upvaluejoin(<function>,<table>,<function>,1)	...number expected...
+-		debug.upvaluejoin(<function>,<function>,<function>,1)	...number expected...
+-		debug.upvaluejoin(<function>,<thread>,<function>,1)	...number expected...
+--- checkallerrors
 -		debug.upvaluejoin(<function>,1,nil,1)	...function expected...
 -		debug.upvaluejoin(<function>,1,'abc',1)	...function expected...
 -		debug.upvaluejoin(<function>,1,1.25,1)	...function expected...
@@ -507,3 +521,19 @@ stack traceback:
 -		debug.upvaluejoin(<function>,1,<function>,<table>)	...number expected...
 -		debug.upvaluejoin(<function>,1,<function>,<function>)	...number expected...
 -		debug.upvaluejoin(<function>,1,<function>,<thread>)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(1,<function>,<function>,1)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(<function>,<function>,1,1)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(<function>,1,1,<function>)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(<function>,<function>,1,<function>)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(1,1,1,<function>)	...function expected...
+--- checkallerrors
+-		debug.upvaluejoin(1,<function>,<function>,<function>)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(1,<function>,1,1)	...number expected...
+--- checkallerrors
+-		debug.upvaluejoin(1,<function>,1,<function>)	...number expected...