diff --git a/luaj-test/src/test/resources/errors/debuglibargs.lua b/luaj-test/src/test/resources/errors/debuglibargs.lua
index ad4a930..085a077 100644
--- a/luaj-test/src/test/resources/errors/debuglibargs.lua
+++ b/luaj-test/src/test/resources/errors/debuglibargs.lua
@@ -114,6 +114,9 @@ checkallerrors('debug.setupvalue',{{f}},'value expected')
 checkallerrors('debug.setupvalue',{{f},{2}},'value expected')
 checkallerrors('debug.setupvalue',{notafunction,{2}}, 'value expected')
 checkallerrors('debug.setupvalue',{{f},notanumber}, 'value expected')
+checkallerrors('debug.setupvalue',{{f},notanumber,{2}}, 'number expected')
+checkallerrors('debug.setupvalue',{notafunction,{2},{2}}, 'function expected')
+checkallerrors('debug.setupvalue',{notafunction,notanumber,{2}}, 'number expected')
 
 -- debug.setuservalue (udata, value)
 banner('debug.setuservalue')
diff --git a/luaj-test/src/test/resources/errors/jse/debuglibargs.out b/luaj-test/src/test/resources/errors/jse/debuglibargs.out
index d128453..b33023a 100644
--- a/luaj-test/src/test/resources/errors/jse/debuglibargs.out
+++ b/luaj-test/src/test/resources/errors/jse/debuglibargs.out
@@ -286,6 +286,57 @@ p,q	abc	abc
 -		debug.setupvalue(<function>,<table>)	...value expected...
 -		debug.setupvalue(<function>,<function>)	...value expected...
 -		debug.setupvalue(<function>,<thread>)	...value expected...
+--- checkallerrors
+-		debug.setupvalue(<function>,nil,2)	...number expected...
+-		debug.setupvalue(<function>,'abc',2)	...number expected...
+-		debug.setupvalue(<function>,true,2)	...number expected...
+-		debug.setupvalue(<function>,<table>,2)	...number expected...
+-		debug.setupvalue(<function>,<function>,2)	...number expected...
+-		debug.setupvalue(<function>,<thread>,2)	...number expected...
+--- checkallerrors
+-		debug.setupvalue(nil,2,2)	...function expected...
+-		debug.setupvalue('abc',2,2)	...function expected...
+-		debug.setupvalue(1.25,2,2)	...function expected...
+-		debug.setupvalue(true,2,2)	...function expected...
+-		debug.setupvalue(<table>,2,2)	...function expected...
+-		debug.setupvalue(<thread>,2,2)	...function expected...
+--- checkallerrors
+-		debug.setupvalue(nil,nil,2)	...number expected...
+-		debug.setupvalue('abc',nil,2)	...number expected...
+-		debug.setupvalue(1.25,nil,2)	...number expected...
+-		debug.setupvalue(true,nil,2)	...number expected...
+-		debug.setupvalue(<table>,nil,2)	...number expected...
+-		debug.setupvalue(<thread>,nil,2)	...number expected...
+-		debug.setupvalue(nil,'abc',2)	...number expected...
+-		debug.setupvalue('abc','abc',2)	...number expected...
+-		debug.setupvalue(1.25,'abc',2)	...number expected...
+-		debug.setupvalue(true,'abc',2)	...number expected...
+-		debug.setupvalue(<table>,'abc',2)	...number expected...
+-		debug.setupvalue(<thread>,'abc',2)	...number expected...
+-		debug.setupvalue(nil,true,2)	...number expected...
+-		debug.setupvalue('abc',true,2)	...number expected...
+-		debug.setupvalue(1.25,true,2)	...number expected...
+-		debug.setupvalue(true,true,2)	...number expected...
+-		debug.setupvalue(<table>,true,2)	...number expected...
+-		debug.setupvalue(<thread>,true,2)	...number expected...
+-		debug.setupvalue(nil,<table>,2)	...number expected...
+-		debug.setupvalue('abc',<table>,2)	...number expected...
+-		debug.setupvalue(1.25,<table>,2)	...number expected...
+-		debug.setupvalue(true,<table>,2)	...number expected...
+-		debug.setupvalue(<table>,<table>,2)	...number expected...
+-		debug.setupvalue(<thread>,<table>,2)	...number expected...
+-		debug.setupvalue(nil,<function>,2)	...number expected...
+-		debug.setupvalue('abc',<function>,2)	...number expected...
+-		debug.setupvalue(1.25,<function>,2)	...number expected...
+-		debug.setupvalue(true,<function>,2)	...number expected...
+-		debug.setupvalue(<table>,<function>,2)	...number expected...
+-		debug.setupvalue(<thread>,<function>,2)	...number expected...
+-		debug.setupvalue(nil,<thread>,2)	...number expected...
+-		debug.setupvalue('abc',<thread>,2)	...number expected...
+-		debug.setupvalue(1.25,<thread>,2)	...number expected...
+-		debug.setupvalue(true,<thread>,2)	...number expected...
+-		debug.setupvalue(<table>,<thread>,2)	...number expected...
+-		debug.setupvalue(<thread>,<thread>,2)	...number expected...
 ====== debug.setuservalue ======
 --- checkallerrors
 -		debug.setuservalue()	...userdata expected...
@@ -318,7 +369,7 @@ p,q	abc	abc
 	[C]: in function 'pcall'
 	args.lua:144: in function 'invoke'
 	args.lua:168: in function 'checkallpass'
-	debuglibargs.lua:127: in main chunk
+	debuglibargs.lua:130: in main chunk
 	[C]: in ?'
 --- checkallpass
 -		debug.traceback('abc')	'abc
@@ -326,7 +377,7 @@ stack traceback:
 	[C]: in function 'pcall'
 	args.lua:144: in function 'invoke'
 	args.lua:168: in function 'checkallpass'
-	debuglibargs.lua:128: in main chunk
+	debuglibargs.lua:131: in main chunk
 	[C]: in ?'
 --- checkallpass
 -		debug.traceback('abc',1.25)	'abc
@@ -334,14 +385,14 @@ stack traceback:
 	[C]: in function 'pcall'
 	args.lua:144: in function 'invoke'
 	args.lua:168: in function 'checkallpass'
-	debuglibargs.lua:129: in main chunk
+	debuglibargs.lua:132: in main chunk
 	[C]: in ?'
 --- checkallpass
 -		debug.traceback(<thread>)	'stack traceback:
 	[C]: in function 'pcall'
 	args.lua:144: in function 'invoke'
 	args.lua:168: in function 'checkallpass'
-	debuglibargs.lua:130: in main chunk
+	debuglibargs.lua:133: in main chunk
 	[C]: in ?'
 --- checkallpass
 -		debug.traceback(<thread>,'abc')	'abc
@@ -349,7 +400,7 @@ stack traceback:
 	[C]: in function 'pcall'
 	args.lua:144: in function 'invoke'
 	args.lua:168: in function 'checkallpass'
-	debuglibargs.lua:131: in main chunk
+	debuglibargs.lua:134: in main chunk
 	[C]: in ?'
 --- checkallpass
 -		debug.traceback(<thread>,'abc',1.25)	'abc
@@ -357,7 +408,7 @@ stack traceback:
 	[C]: in function 'pcall'
 	args.lua:144: in function 'invoke'
 	args.lua:168: in function 'checkallpass'
-	debuglibargs.lua:132: in main chunk
+	debuglibargs.lua:135: in main chunk
 	[C]: in ?'
 --- checkallpass
 -		debug.traceback(<function>)	<function>