new file mode 100644
--- /dev/null
+++ b/tests/Test_PStimedate.java
@@ -0,0 +1,94 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0.  If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+ */
+
+import java.sql.*;
+
+public class Test_PStimedate {
+	public static void main(String[] args) throws Exception {
+		Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+		Connection con = DriverManager.getConnection(args[0]);
+		Statement stmt = con.createStatement();
+		PreparedStatement pstmt;
+		ResultSet rs = null;
+		//DatabaseMetaData dbmd = con.getMetaData();
+
+		con.setAutoCommit(false);
+		// >> false: auto commit was just switched off
+		System.out.println("0. false\t" + con.getAutoCommit());
+
+		try {
+			stmt.executeUpdate("CREATE TABLE table_Test_PStimedate (t time, ts timestamp, d date)");
+		} catch (SQLException e) {
+			System.out.println(e);
+			System.out.println("Creation of test table failed! :(");
+			System.out.println("ABORTING TEST!!!");
+			System.exit(-1);
+		}
+
+		try {
+			pstmt = con.prepareStatement("INSERT INTO table_Test_PStimedate VALUES (?, ?, ?)");
+			System.out.print("1. empty call...");
+			try {
+				// should fail (no arguments given)
+				pstmt.execute();
+				System.out.println(" PASSED :(");
+				System.out.println("ABORTING TEST!!!");
+				System.exit(-1);
+			} catch (SQLException e) {
+				System.out.println(" failed :)");
+			}
+
+			System.out.print("2. inserting a record...");
+			java.util.Date d = new java.util.Date();
+			pstmt.setTime(1, new java.sql.Time(d.getTime()));
+			pstmt.setTimestamp(2, new java.sql.Timestamp(d.getTime()));
+			pstmt.setDate(3, new java.sql.Date(d.getTime()));
+
+			pstmt.executeUpdate();
+			System.out.println(" passed :)");
+			System.out.print("3. closing PreparedStatement...");
+			pstmt.close();
+			System.out.println(" passed :)");
+
+			System.out.print("4. selecting record...");
+			pstmt = con.prepareStatement("SELECT * FROM table_Test_PStimedate");
+			rs = pstmt.executeQuery();
+			System.out.println(" passed :)");
+
+			while (rs.next()) {
+				for (int j = 1; j <= 3; j++) {
+					System.out.print((j + 4) + ". retrieving...");
+					java.util.Date x = (java.util.Date)(rs.getObject(j));
+					boolean matches = false;
+					if (x instanceof Time) {
+						System.out.print(" (Time)");
+						matches = (new Time(d.getTime())).toString().equals(x.toString());
+					} else if (x instanceof Date) {
+						System.out.print(" (Date)");
+						matches = (new Date(d.getTime())).toString().equals(x.toString());
+					} else if (x instanceof Timestamp) {
+						System.out.print(" (Timestamp)");
+						matches = (new Timestamp(d.getTime())).toString().equals(x.toString());
+					}
+					if (matches) {
+						System.out.println(" passed :)");
+					} else {
+						System.out.println(" FAILED :( (" + x + " is not " + d + ")");
+					}
+				}
+			}
+
+			con.rollback();
+		} catch (SQLException e) {
+			System.out.println("FAILED :( "+ e.getMessage());
+			System.out.println("ABORTING TEST!!!");
+		}
+
+		con.close();
+	}
+}