--- a/tests/JDBC_API_Tester.java
+++ b/tests/JDBC_API_Tester.java
@@ -766,13 +766,46 @@ public final class JDBC_API_Tester {
 		}
 
 		compareExpectedOutput("Test_Driver",
-			"0  user  true  null  User loginname to use when authenticating on the database server\n" +
-			"1  password  true  null  Password to use when authenticating on the database server\n" +
+			"0  user  true    user name to authenticate as\n" +
+			"1  password  true    password to authenticate with\n" +
+			"2  host  false    IP number, domain name or one of the special values `localhost` and `localhost.`\n" +
+			"3  port  false  -1  Port to connect to, 1..65535 or -1 for 'not set'\n" +
+			"4  database  false    name of database to connect to\n" +
+			"5  autocommit  false  true  initial value of autocommit\n" +
+			"6  schema  false    initial schema\n" +
+			"7  timezone  false  60  client time zone as minutes east of UTC\n" +
+			"8  replysize  false  250  rows beyond this limit are retrieved on demand, <1 means unlimited\n" +
+			"9  debug  false  false  enable tracing of socket communication for debugging\n" +
+			"10  logfile  false    when debug is enabled its output will be written to this logfile\n" +
+			"11  so_timeout  false  0  abort if network I/O does not complete in this many milliseconds, 0 means no timeout\n" +
+			"12  treat_clob_as_varchar  false  true  map CLOB/TEXT data to type VARCHAR instead of type CLOB\n" +
+			"13  treat_blob_as_binary  false  true  map BLOB data to type BINARY instead of type BLOB\n" +
+			"14  client_info  false  true  whether to send ClientInfo when connecting\n" +
+			"15  client_application  false    application name to send in ClientInfo\n" +
+			"16  client_remark  false    any client remark to send in ClientInfo\n" +
 			"getPropertyInfo of jdbc:monetdbs:\n" +
-			"0  user  true  null  User loginname to use when authenticating on the database server\n" +
-			"1  password  true  null  Password to use when authenticating on the database server\n" +
-			"2  tls  true  null  secure the connection using TLS\n" +
-			"3  cert  true  null  path to TLS certificate to authenticate server with\n");
+			"0  user  true    user name to authenticate as\n" +
+			"1  password  true    password to authenticate with\n" +
+			"2  tls  false  false  secure the connection using TLS\n" +
+			"3  host  false    IP number, domain name or one of the special values `localhost` and `localhost.`\n" +
+			"4  port  false  -1  Port to connect to, 1..65535 or -1 for 'not set'\n" +
+			"5  database  false    name of database to connect to\n" +
+			"6  cert  false    path to TLS certificate to authenticate server with\n" +
+			"7  certhash  false    hash of server TLS certificate must start with these hex digits; overrides cert\n" +
+			"8  clientkey  false    path to TLS key (+certs) to authenticate with as client\n" +
+			"9  clientcert  false    path to TLS certs for 'clientkey', if not included there\n" +
+			"10  autocommit  false  true  initial value of autocommit\n" +
+			"11  schema  false    initial schema\n" +
+			"12  timezone  false  60  client time zone as minutes east of UTC\n" +
+			"13  replysize  false  250  rows beyond this limit are retrieved on demand, <1 means unlimited\n" +
+			"14  debug  false  false  enable tracing of socket communication for debugging\n" +
+			"15  logfile  false    when debug is enabled its output will be written to this logfile\n" +
+			"16  so_timeout  false  0  abort if network I/O does not complete in this many milliseconds, 0 means no timeout\n" +
+			"17  treat_clob_as_varchar  false  true  map CLOB/TEXT data to type VARCHAR instead of type CLOB\n" +
+			"18  treat_blob_as_binary  false  true  map BLOB data to type BINARY instead of type BLOB\n" +
+			"19  client_info  false  true  whether to send ClientInfo when connecting\n" +
+			"20  client_application  false    application name to send in ClientInfo\n" +
+			"21  client_remark  false    any client remark to send in ClientInfo\n");
 	}
 
 	private void handleExecuteDDL(Statement stmt, String action, String objtype, String objname, String sql) {