new file mode 100644
--- /dev/null
+++ b/DBD/t/11prep.t
@@ -0,0 +1,62 @@
+#!perl -I./t
+
+# 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.
+
+$| = 1;
+
+use strict;
+use warnings;
+use DBI();
+use DBD_TEST();
+
+use Test::More;
+
+if (defined $ENV{DBI_DSN}) {
+  plan tests => 15;
+} else {
+  plan skip_all => 'Cannot test without DB info';
+}
+
+pass('Simple prepare/execute/finish tests');
+
+my $dbh = DBI->connect or die "Connect failed: $DBI::errstr\n";
+pass('Database connection created');
+
+my $tbl = $DBD_TEST::table_name;
+
+{
+  local ($dbh->{PrintError}, $dbh->{RaiseError}, $dbh->{Warn});
+  $dbh->{PrintError} = 0; $dbh->{RaiseError} = 0; $dbh->{Warn} = 0;
+  $dbh->do("DROP TABLE $tbl");
+}
+
+ok( $dbh->disconnect,'Disconnect');
+
+$dbh = DBI->connect or die "Connect failed: $DBI::errstr\n";
+pass('Database connection created');
+{
+  local $dbh->{PrintError} = 0;
+  local $dbh->{RaiseError} = 1;
+  ok( !eval{ $dbh->do("DROP TABLE $tbl") },"DROP TABLE $tbl");
+  print $@, "\n";
+}
+ok( $dbh->do("CREATE TABLE $tbl( chr char( 1 ) )"),"CREATE TABLE $tbl");
+
+my $sth;
+ok( $sth = $dbh->prepare("SELECT * FROM $tbl"),"SELECT * FROM $tbl");
+ok( $sth->execute,'Execute');
+ok( $sth->finish,'Finish');
+ok( $sth = $dbh->prepare("SELECT * FROM $tbl"),"SELECT * FROM $tbl");
+ok( $sth->finish,'Finish');
+ok( $sth = $dbh->prepare("SELECT * FROM $tbl"),"SELECT * FROM $tbl");
+ok( !( $sth = undef ),'Set sth to undefined');
+#ok( $sth = $dbh->prepare("SELECT * FROM $tbl", { monetdb_ => ... } ),"SELECT * FROM $tbl ( monetdb_ => ... )");
+#ok( $sth->execute,'Execute');
+#ok( !( $sth = undef ),'Set sth to undefined');
+ok( $dbh->do("DROP TABLE $tbl"),"DROP TABLE $tbl");
+
+ok( $dbh->disconnect,'Disconnect');