diff --git a/tests/test-fails.conf b/tests/test-fails.conf
index 953eaa738..d976b307b 100644
--- a/tests/test-fails.conf
+++ b/tests/test-fails.conf
@@ -108,6 +108,7 @@
 -m
 
 # Verify Callback Failure Tests
+# no error going into callback, return error
 # server
 -v 3
 -l ECDHE-RSA-AES128-GCM-SHA256
@@ -143,3 +144,26 @@
 # client
 -v 3
 -l ECDHE-ECDSA-AES128-GCM-SHA256
+
+# error going into callback, return error
+# server
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-c ./certs/test/server-cert-rsa-badsig.pem
+-k ./certs/server-key.pem
+
+# client verify should fail
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-H verifyFail
+
+# server
+-v 3
+-l ECDHE-ECDSA-AES128-GCM-SHA256
+-c ./certs/test/server-cert-ecc-badsig.pem
+-k ./certs/ecc-key.pem
+
+# client verify should fail
+-v 3
+-l ECDHE-ECDSA-AES128-GCM-SHA256
+-H verifyFail
diff --git a/tests/test.conf b/tests/test.conf
index b8017c848..e6f72bfea 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -2199,6 +2199,7 @@
 -v 3
 -l NTRU-AES128-SHA
 
+# error going into callback, return ok
 # server TLSv1.2 verify callback override
 -v 3
 -l ECDHE-RSA-AES128-GCM-SHA256
@@ -2221,6 +2222,29 @@
 -A ./certs/ca-ecc-cert.pem
 -j
 
+# no error going into callback, return ok
+# server TLSv1.2 verify callback override
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-c ./certs/server-cert.pem
+
+# client TLSv1.2 verify callback override
+-v 3
+-l ECDHE-RSA-AES128-GCM-SHA256
+-j
+
+# server TLSv1.2 verify callback override
+-v 3
+-l ECDHE-ECDSA-AES128-GCM-SHA256
+-c ./certs/test/server-ecc.pem
+-k ./certs/ecc-key.pem
+
+# client TLSv1.2 verify callback override
+-v 3
+-l ECDHE-ECDSA-AES128-GCM-SHA256
+-A ./certs/ca-ecc-cert.pem
+-j
+
 # server TLSv1.2 ECDHE-EDCSA-CHACHA20-POLY1305
 -v 3
 -l ECDHE-ECDSA-CHACHA20-POLY1305