diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt
new file mode 100644
index 00000000000..08f63db47d1
--- /dev/null
+++ b/ext/imap/tests/imap_body.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_body() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_body();
+
+echo  "Checking with incorrect parameter type\n";
+imap_body('');
+imap_body(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_body() expects at least 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
+
+Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d
diff --git a/ext/imap/tests/imap_expunge_error.phpt b/ext/imap/tests/imap_expunge_error.phpt
new file mode 100644
index 00000000000..d99dcf0ff10
--- /dev/null
+++ b/ext/imap/tests/imap_expunge_error.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_num_recent() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_num_recent();
+
+echo  "Checking with incorrect parameter type\n";
+imap_num_recent('');
+imap_num_recent(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_num_recent() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_num_recent() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_num_recent() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt
new file mode 100644
index 00000000000..c0830c000d4
--- /dev/null
+++ b/ext/imap/tests/imap_gc_error.phpt
@@ -0,0 +1,28 @@
+--TEST--
+imap_gc() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_gc();
+
+echo  "Checking with incorrect parameter type\n";
+imap_gc('', false);
+imap_gc(false, false);
+
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_gc() expects exactly 2 parameters, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_gc() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_gc() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_headers.phpt b/ext/imap/tests/imap_headers.phpt
new file mode 100644
index 00000000000..93c51f9a28d
--- /dev/null
+++ b/ext/imap/tests/imap_headers.phpt
@@ -0,0 +1,28 @@
+--TEST--
+imap_headers() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_headers();
+
+echo  "Checking with incorrect parameter type\n";
+imap_headers('');
+imap_headers(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_headers() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_headers() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_headers() expects parameter 1 to be resource, boolean given in %s on line %d
+
diff --git a/ext/imap/tests/imap_num_msg_error.phpt b/ext/imap/tests/imap_num_msg_error.phpt
new file mode 100644
index 00000000000..6c4f50e021a
--- /dev/null
+++ b/ext/imap/tests/imap_num_msg_error.phpt
@@ -0,0 +1,28 @@
+--TEST--
+imap_num_msg() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_num_msg();
+
+echo  "Checking with incorrect parameter type\n";
+imap_num_msg('');
+imap_num_msg(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_num_msg() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_num_msg() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_num_msg() expects parameter 1 to be resource, boolean given in %s on line %d
+
diff --git a/ext/imap/tests/imap_num_recent_error.phpt b/ext/imap/tests/imap_num_recent_error.phpt
new file mode 100644
index 00000000000..e723473b7e1
--- /dev/null
+++ b/ext/imap/tests/imap_num_recent_error.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_expunge() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_expunge();
+
+echo  "Checking with incorrect parameter type\n";
+imap_expunge('');
+imap_expunge(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_expunge() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_expunge() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_expunge() expects parameter 1 to be resource, boolean given in %s on line %d
diff --git a/ext/imap/tests/imap_open_error.phpt b/ext/imap/tests/imap_open_error.phpt
new file mode 100644
index 00000000000..7934ee2ef75
--- /dev/null
+++ b/ext/imap/tests/imap_open_error.phpt
@@ -0,0 +1,42 @@
+--TEST--
+imap_open() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_open();
+imap_open(false);
+imap_open(false, false);
+imap_open('');
+imap_open('', '');
+
+echo "Checking with incorrect parameters\n" ;
+imap_open('', '', '');
+imap_open('', '', '', -1);
+
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_open() expects at least 3 parameters, 0 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 2 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: imap_open() expects at least 3 parameters, 2 given in %s on line %d
+Checking with incorrect parameters
+
+Warning: imap_open(): Couldn't open stream  in %s on line %d
+
+Warning: imap_open(): Couldn't open stream  in %s on line %d
+
+Notice: Unknown: Can't open mailbox : no such mailbox (errflg=2) in Unknown on line 0
diff --git a/ext/imap/tests/imap_ping_error.phpt b/ext/imap/tests/imap_ping_error.phpt
new file mode 100644
index 00000000000..7c87867bdcc
--- /dev/null
+++ b/ext/imap/tests/imap_ping_error.phpt
@@ -0,0 +1,27 @@
+--TEST--
+imap_ping() incorrect parameter count
+--CREDITS--
+Paul Sohier
+#phptestfest utrecht
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--FILE--
+<?php
+echo "Checking with no parameters\n";
+imap_ping();
+
+echo  "Checking with incorrect parameter type\n";
+imap_ping('');
+imap_ping(false);
+?>
+--EXPECTF--
+Checking with no parameters
+
+Warning: imap_ping() expects exactly 1 parameter, 0 given in %s on line %d
+Checking with incorrect parameter type
+
+Warning: imap_ping() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+
+Warning: imap_ping() expects parameter 1 to be resource, boolean given in %s on line %d