diff --git a/tokio-postgres/tests/test.rs b/tokio-postgres/tests/test.rs
index 06d85d64..9df119df 100644
--- a/tokio-postgres/tests/test.rs
+++ b/tokio-postgres/tests/test.rs
@@ -13,6 +13,8 @@ use tokio_postgres::error::SqlState;
 use tokio_postgres::types::{Kind, Type};
 use tokio_postgres::{AsyncMessage, Client, Connection, NoTls};
 
+mod types;
+
 fn connect(
     builder: &tokio_postgres::Builder,
 ) -> impl Future<Item = (Client, Connection<TcpStream>), Error = tokio_postgres::Error> {
diff --git a/tokio-postgres/tests/types/bit_vec_07.rs b/tokio-postgres/tests/types/bit_vec_07.rs
new file mode 100644
index 00000000..3ab29ee7
--- /dev/null
+++ b/tokio-postgres/tests/types/bit_vec_07.rs
@@ -0,0 +1,29 @@
+use bit_vec_07::BitVec;
+
+use crate::types::test_type;
+
+#[test]
+fn test_bit_params() {
+    let mut bv = BitVec::from_bytes(&[0b0110_1001, 0b0000_0111]);
+    bv.pop();
+    bv.pop();
+    test_type(
+        "BIT(14)",
+        &[(Some(bv), "B'01101001000001'"), (None, "NULL")],
+    )
+}
+
+#[test]
+fn test_varbit_params() {
+    let mut bv = BitVec::from_bytes(&[0b0110_1001, 0b0000_0111]);
+    bv.pop();
+    bv.pop();
+    test_type(
+        "VARBIT",
+        &[
+            (Some(bv), "B'01101001000001'"),
+            (Some(BitVec::from_bytes(&[])), "B''"),
+            (None, "NULL"),
+        ],
+    )
+}
diff --git a/tokio-postgres/tests/types/chrono_04.rs b/tokio-postgres/tests/types/chrono_04.rs
new file mode 100644
index 00000000..224a5487
--- /dev/null
+++ b/tokio-postgres/tests/types/chrono_04.rs
@@ -0,0 +1,148 @@
+use chrono_04::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
+use tokio_postgres::types::{Date, Timestamp};
+
+use crate::types::test_type;
+
+#[test]
+fn test_naive_date_time_params() {
+    fn make_check<'a>(time: &'a str) -> (Option<NaiveDateTime>, &'a str) {
+        (
+            Some(NaiveDateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'").unwrap()),
+            time,
+        )
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_with_special_naive_date_time_params() {
+    fn make_check<'a>(time: &'a str) -> (Timestamp<NaiveDateTime>, &'a str) {
+        (
+            Timestamp::Value(
+                NaiveDateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'").unwrap(),
+            ),
+            time,
+        )
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    );
+}
+
+#[test]
+fn test_date_time_params() {
+    fn make_check<'a>(time: &'a str) -> (Option<DateTime<Utc>>, &'a str) {
+        (
+            Some(
+                Utc.datetime_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'")
+                    .unwrap(),
+            ),
+            time,
+        )
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_with_special_date_time_params() {
+    fn make_check<'a>(time: &'a str) -> (Timestamp<DateTime<Utc>>, &'a str) {
+        (
+            Timestamp::Value(
+                Utc.datetime_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'")
+                    .unwrap(),
+            ),
+            time,
+        )
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    );
+}
+
+#[test]
+fn test_date_params() {
+    fn make_check<'a>(time: &'a str) -> (Option<NaiveDate>, &'a str) {
+        (
+            Some(NaiveDate::parse_from_str(time, "'%Y-%m-%d'").unwrap()),
+            time,
+        )
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_with_special_date_params() {
+    fn make_check<'a>(date: &'a str) -> (Date<NaiveDate>, &'a str) {
+        (
+            Date::Value(NaiveDate::parse_from_str(date, "'%Y-%m-%d'").unwrap()),
+            date,
+        )
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (Date::PosInfinity, "'infinity'"),
+            (Date::NegInfinity, "'-infinity'"),
+        ],
+    );
+}
+
+#[test]
+fn test_time_params() {
+    fn make_check<'a>(time: &'a str) -> (Option<NaiveTime>, &'a str) {
+        (
+            Some(NaiveTime::parse_from_str(time, "'%H:%M:%S.%f'").unwrap()),
+            time,
+        )
+    }
+    test_type(
+        "TIME",
+        &[
+            make_check("'00:00:00.010000000'"),
+            make_check("'11:19:33.100314000'"),
+            make_check("'23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    );
+}
diff --git a/tokio-postgres/tests/types/eui48_04.rs b/tokio-postgres/tests/types/eui48_04.rs
new file mode 100644
index 00000000..a881e24f
--- /dev/null
+++ b/tokio-postgres/tests/types/eui48_04.rs
@@ -0,0 +1,17 @@
+use eui48_04::MacAddress;
+
+use crate::types::test_type;
+
+#[test]
+fn test_eui48_params() {
+    test_type(
+        "MACADDR",
+        &[
+            (
+                Some(MacAddress::parse_str("12-34-56-AB-CD-EF").unwrap()),
+                "'12-34-56-ab-cd-ef'",
+            ),
+            (None, "NULL"),
+        ],
+    )
+}
diff --git a/tokio-postgres/tests/types/geo_010.rs b/tokio-postgres/tests/types/geo_010.rs
new file mode 100644
index 00000000..a782a736
--- /dev/null
+++ b/tokio-postgres/tests/types/geo_010.rs
@@ -0,0 +1,57 @@
+use geo_010::{Coordinate, LineString, Point, Rect};
+
+use crate::types::test_type;
+
+#[test]
+fn test_point_params() {
+    test_type(
+        "POINT",
+        &[
+            (Some(Point::new(0.0, 0.0)), "POINT(0, 0)"),
+            (Some(Point::new(-3.14, 1.618)), "POINT(-3.14, 1.618)"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_box_params() {
+    test_type(
+        "BOX",
+        &[
+            (
+                Some(Rect {
+                    min: Coordinate { x: -3.14, y: 1.618 },
+                    max: Coordinate {
+                        x: 160.0,
+                        y: 69701.5615,
+                    },
+                }),
+                "BOX(POINT(160.0, 69701.5615), POINT(-3.14, 1.618))",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_path_params() {
+    let points = vec![
+        Coordinate { x: 0., y: 0. },
+        Coordinate { x: -3.14, y: 1.618 },
+        Coordinate {
+            x: 160.0,
+            y: 69701.5615,
+        },
+    ];
+    test_type(
+        "PATH",
+        &[
+            (
+                Some(LineString(points)),
+                "path '((0, 0), (-3.14, 1.618), (160.0, 69701.5615))'",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
diff --git a/tokio-postgres/tests/types/mod.rs b/tokio-postgres/tests/types/mod.rs
new file mode 100644
index 00000000..6ce526d0
--- /dev/null
+++ b/tokio-postgres/tests/types/mod.rs
@@ -0,0 +1,612 @@
+use futures::{Future, Stream};
+use std::collections::HashMap;
+use std::error::Error;
+use std::f32;
+use std::f64;
+use std::fmt;
+use std::result;
+use std::time::{Duration, UNIX_EPOCH};
+use tokio::runtime::current_thread::Runtime;
+use tokio_postgres::to_sql_checked;
+use tokio_postgres::types::{FromSql, FromSqlOwned, IsNull, Kind, ToSql, Type, WrongType};
+
+use crate::connect;
+
+#[cfg(feature = "with-bit-vec-0.7")]
+mod bit_vec_07;
+#[cfg(feature = "with-chrono-0.4")]
+mod chrono_04;
+#[cfg(feature = "with-eui48-0.4")]
+mod eui48_04;
+#[cfg(feature = "with-geo-0.10")]
+mod geo_010;
+#[cfg(feature = "with-serde_json-1")]
+mod serde_json_1;
+#[cfg(feature = "with-uuid-0.7")]
+mod uuid_07;
+
+fn test_type<T, S>(sql_type: &str, checks: &[(T, S)])
+where
+    T: PartialEq + for<'a> FromSqlOwned + ToSql,
+    S: fmt::Display,
+{
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    for &(ref val, ref repr) in checks.iter() {
+        let prepare = client.prepare(&format!("SELECT {}::{}", repr, sql_type));
+        let stmt = runtime.block_on(prepare).unwrap();
+        let query = client.query(&stmt, &[]).collect();
+        let rows = runtime.block_on(query).unwrap();
+        let result = rows[0].get(0);
+        assert_eq!(val, &result);
+
+        let prepare = client.prepare(&format!("SELECT $1::{}", sql_type));
+        let stmt = runtime.block_on(prepare).unwrap();
+        let query = client.query(&stmt, &[val]).collect();
+        let rows = runtime.block_on(query).unwrap();
+        let result = rows[0].get(0);
+        assert_eq!(val, &result);
+    }
+}
+
+#[test]
+fn test_bool_params() {
+    test_type(
+        "BOOL",
+        &[(Some(true), "'t'"), (Some(false), "'f'"), (None, "NULL")],
+    );
+}
+
+#[test]
+fn test_i8_params() {
+    test_type("\"char\"", &[(Some('a' as i8), "'a'"), (None, "NULL")]);
+}
+
+#[test]
+fn test_name_params() {
+    test_type(
+        "NAME",
+        &[
+            (Some("hello world".to_owned()), "'hello world'"),
+            (
+                Some("イロハニホヘト チリヌルヲ".to_owned()),
+                "'イロハニホヘト チリヌルヲ'",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_i16_params() {
+    test_type(
+        "SMALLINT",
+        &[
+            (Some(15001i16), "15001"),
+            (Some(-15001i16), "-15001"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_i32_params() {
+    test_type(
+        "INT",
+        &[
+            (Some(2147483548i32), "2147483548"),
+            (Some(-2147483548i32), "-2147483548"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_oid_params() {
+    test_type(
+        "OID",
+        &[
+            (Some(2147483548u32), "2147483548"),
+            (Some(4000000000), "4000000000"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_i64_params() {
+    test_type(
+        "BIGINT",
+        &[
+            (Some(9223372036854775708i64), "9223372036854775708"),
+            (Some(-9223372036854775708i64), "-9223372036854775708"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_f32_params() {
+    test_type(
+        "REAL",
+        &[
+            (Some(f32::INFINITY), "'infinity'"),
+            (Some(f32::NEG_INFINITY), "'-infinity'"),
+            (Some(1000.55), "1000.55"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_f64_params() {
+    test_type(
+        "DOUBLE PRECISION",
+        &[
+            (Some(f64::INFINITY), "'infinity'"),
+            (Some(f64::NEG_INFINITY), "'-infinity'"),
+            (Some(10000.55), "10000.55"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_varchar_params() {
+    test_type(
+        "VARCHAR",
+        &[
+            (Some("hello world".to_owned()), "'hello world'"),
+            (
+                Some("イロハニホヘト チリヌルヲ".to_owned()),
+                "'イロハニホヘト チリヌルヲ'",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_text_params() {
+    test_type(
+        "TEXT",
+        &[
+            (Some("hello world".to_owned()), "'hello world'"),
+            (
+                Some("イロハニホヘト チリヌルヲ".to_owned()),
+                "'イロハニホヘト チリヌルヲ'",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_borrowed_text() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let prepare = client.prepare("SELECT 'foo'");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[]).collect();
+    let rows = runtime.block_on(query).unwrap();
+    let s: &str = rows[0].get(0);
+    assert_eq!(s, "foo");
+}
+
+#[test]
+fn test_bpchar_params() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute(
+        "CREATE TEMPORARY TABLE foo (
+            id SERIAL PRIMARY KEY,
+            b CHAR(5)
+        )",
+    );
+    runtime.block_on(batch).unwrap();
+
+    let prepare = client.prepare("INSERT INTO foo (b) VALUES ($1), ($2), ($3)");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let execute = client.execute(&stmt, &[&"12345", &"123", &None::<&'static str>]);
+    runtime.block_on(execute).unwrap();
+
+    let prepare = client.prepare("SELECT b FROM foo ORDER BY id");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[]).collect();
+    let res = runtime.block_on(query).unwrap();
+
+    assert_eq!(
+        vec![Some("12345".to_owned()), Some("123  ".to_owned()), None],
+        res.iter().map(|row| row.get(0)).collect::<Vec<_>>()
+    );
+}
+
+#[test]
+fn test_citext_params() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute(
+        "CREATE TEMPORARY TABLE foo (
+            id SERIAL PRIMARY KEY,
+            b CITEXT
+        )",
+    );
+    runtime.block_on(batch).unwrap();
+
+    let prepare = client.prepare("INSERT INTO foo (b) VALUES ($1), ($2), ($3)");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let execute = client.execute(&stmt, &[&"foobar", &"FooBar", &None::<&'static str>]);
+    runtime.block_on(execute).unwrap();
+
+    let prepare = client.prepare("SELECT b FROM foo WHERE b = 'FOOBAR' ORDER BY id");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[]).collect();
+    let res = runtime.block_on(query).unwrap();
+
+    assert_eq!(
+        vec!["foobar".to_string(), "FooBar".to_string()],
+        res.iter()
+            .map(|row| row.get::<_, String>(0))
+            .collect::<Vec<_>>()
+    );
+}
+
+#[test]
+fn test_bytea_params() {
+    test_type(
+        "BYTEA",
+        &[
+            (Some(vec![0u8, 1, 2, 3, 254, 255]), "'\\x00010203feff'"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_borrowed_bytea() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let prepare = client.prepare("SELECT 'foo'::BYTEA");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[]).collect();
+    let rows = runtime.block_on(query).unwrap();
+    let s: &[u8] = rows[0].get(0);
+    assert_eq!(s, b"foo");
+}
+
+#[test]
+fn test_hstore_params() {
+    macro_rules! make_map {
+        ($($k:expr => $v:expr),+) => ({
+            let mut map = HashMap::new();
+            $(map.insert($k, $v);)+
+            map
+        })
+    }
+    test_type(
+        "hstore",
+        &[
+            (
+                Some(make_map!("a".to_owned() => Some("1".to_owned()))),
+                "'a=>1'",
+            ),
+            (
+                Some(make_map!("hello".to_owned() => Some("world!".to_owned()),
+                               "hola".to_owned() => Some("mundo!".to_owned()),
+                               "what".to_owned() => None)),
+                "'hello=>world!,hola=>mundo!,what=>NULL'",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
+
+#[test]
+fn test_array_params() {
+    test_type(
+        "integer[]",
+        &[
+            (Some(vec![1i32, 2i32]), "ARRAY[1,2]"),
+            (Some(vec![1i32]), "ARRAY[1]"),
+            (Some(vec![]), "ARRAY[]"),
+            (None, "NULL"),
+        ],
+    );
+}
+
+fn test_nan_param<T>(sql_type: &str)
+where
+    T: PartialEq + ToSql + FromSqlOwned,
+{
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let prepare = client.prepare(&format!("SELECT 'NaN'::{}", sql_type));
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[]).collect();
+    let rows = runtime.block_on(query).unwrap();
+    let val: T = rows[0].get(0);
+    assert!(val != val);
+}
+
+#[test]
+fn test_f32_nan_param() {
+    test_nan_param::<f32>("REAL");
+}
+
+#[test]
+fn test_f64_nan_param() {
+    test_nan_param::<f64>("DOUBLE PRECISION");
+}
+
+#[test]
+fn test_pg_database_datname() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let prepare = client.prepare("SELECT datname FROM pg_database");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[]).collect();
+    let rows = runtime.block_on(query).unwrap();
+    assert_eq!(rows[0].get::<_, &str>(0), "postgres");
+}
+
+#[test]
+fn test_slice() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute(
+        "CREATE TEMPORARY TABLE foo (
+            id SERIAL PRIMARY KEY,
+            f TEXT
+        );
+
+        INSERT INTO foo(f) VALUES ('a'), ('b'), ('c'), ('d');
+        ",
+    );
+    runtime.block_on(batch).unwrap();
+
+    let prepare = client.prepare("SELECT f FROM foo WHERE id = ANY($1)");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client
+        .query(&stmt, &[&&[1i32, 3, 4][..]])
+        .map(|r| r.get::<_, String>(0))
+        .collect();
+    let rows = runtime.block_on(query).unwrap();
+
+    assert_eq!(vec!["a".to_owned(), "c".to_owned(), "d".to_owned()], rows);
+}
+
+#[test]
+fn test_slice_wrong_type() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute(
+        "CREATE TEMPORARY TABLE foo (
+            id SERIAL PRIMARY KEY
+        )",
+    );
+    runtime.block_on(batch).unwrap();
+
+    let prepare = client.prepare("SELECT * FROM foo WHERE id = ANY($1)");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[&&[&"hi"][..]]).collect();
+    let err = runtime.block_on(query).err().unwrap();
+    match err.source() {
+        Some(e) if e.is::<WrongType>() => {}
+        _ => panic!("Unexpected error {:?}", err),
+    };
+}
+
+#[test]
+fn test_slice_range() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let prepare = client.prepare("SELECT $1::INT8RANGE");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[&&[&1i64][..]]).collect();
+    let err = runtime.block_on(query).err().unwrap();
+    match err.source() {
+        Some(e) if e.is::<WrongType>() => {}
+        _ => panic!("Unexpected error {:?}", err),
+    };
+}
+
+#[test]
+fn domain() {
+    #[derive(Debug, PartialEq)]
+    struct SessionId(Vec<u8>);
+
+    impl ToSql for SessionId {
+        fn to_sql(
+            &self,
+            ty: &Type,
+            out: &mut Vec<u8>,
+        ) -> result::Result<IsNull, Box<dyn Error + Sync + Send>> {
+            let inner = match *ty.kind() {
+                Kind::Domain(ref inner) => inner,
+                _ => unreachable!(),
+            };
+            self.0.to_sql(inner, out)
+        }
+
+        fn accepts(ty: &Type) -> bool {
+            ty.name() == "session_id"
+                && match *ty.kind() {
+                    Kind::Domain(_) => true,
+                    _ => false,
+                }
+        }
+
+        to_sql_checked!();
+    }
+
+    impl<'a> FromSql<'a> for SessionId {
+        fn from_sql(ty: &Type, raw: &[u8]) -> result::Result<Self, Box<dyn Error + Sync + Send>> {
+            Vec::<u8>::from_sql(ty, raw).map(SessionId)
+        }
+
+        fn accepts(ty: &Type) -> bool {
+            // This is super weird!
+            <Vec<u8> as FromSql>::accepts(ty)
+        }
+    }
+
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute(
+        "CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);
+         CREATE TABLE pg_temp.foo (id pg_temp.session_id);",
+    );
+    runtime.block_on(batch).unwrap();
+
+    let id = SessionId(b"0123456789abcdef".to_vec());
+
+    let prepare = client.prepare("INSERT INTO pg_temp.foo (id) VALUES ($1)");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let execute = client.execute(&stmt, &[&id]);
+    runtime.block_on(execute).unwrap();
+
+    let prepare = client.prepare("SELECT id FROM pg_temp.foo");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let query = client.query(&stmt, &[&id]).collect();
+    let rows = runtime.block_on(query).unwrap();
+    assert_eq!(id, rows[0].get(0));
+}
+
+#[test]
+fn composite() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute(
+        "CREATE TYPE pg_temp.inventory_item AS (
+            name TEXT,
+            supplier INTEGER,
+            price NUMERIC
+        )",
+    );
+    runtime.block_on(batch).unwrap();
+
+    let prepare = client.prepare("SELECT $1::inventory_item");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let type_ = &stmt.params()[0];
+    assert_eq!(type_.name(), "inventory_item");
+    match *type_.kind() {
+        Kind::Composite(ref fields) => {
+            assert_eq!(fields[0].name(), "name");
+            assert_eq!(fields[0].type_(), &Type::TEXT);
+            assert_eq!(fields[1].name(), "supplier");
+            assert_eq!(fields[1].type_(), &Type::INT4);
+            assert_eq!(fields[2].name(), "price");
+            assert_eq!(fields[2].type_(), &Type::NUMERIC);
+        }
+        ref t => panic!("bad type {:?}", t),
+    }
+}
+
+#[test]
+fn enum_() {
+    let mut runtime = Runtime::new().unwrap();
+
+    let handshake = connect(tokio_postgres::Builder::new().user("postgres"));
+    let (mut client, connection) = runtime.block_on(handshake).unwrap();
+    let connection = connection.map_err(|e| panic!("{}", e));
+    runtime.spawn(connection);
+
+    let batch = client.batch_execute("CREATE TYPE pg_temp.mood AS ENUM ('sad', 'ok', 'happy');");
+    runtime.block_on(batch).unwrap();
+
+    let prepare = client.prepare("SELECT $1::mood");
+    let stmt = runtime.block_on(prepare).unwrap();
+    let type_ = &stmt.params()[0];
+    assert_eq!(type_.name(), "mood");
+    match *type_.kind() {
+        Kind::Enum(ref variants) => {
+            assert_eq!(
+                variants,
+                &["sad".to_owned(), "ok".to_owned(), "happy".to_owned()]
+            );
+        }
+        _ => panic!("bad type"),
+    }
+}
+
+#[test]
+fn system_time() {
+    test_type(
+        "TIMESTAMP",
+        &[
+            (
+                Some(UNIX_EPOCH + Duration::from_millis(1_010)),
+                "'1970-01-01 00:00:01.01'",
+            ),
+            (
+                Some(UNIX_EPOCH - Duration::from_millis(1_010)),
+                "'1969-12-31 23:59:58.99'",
+            ),
+            (
+                Some(UNIX_EPOCH + Duration::from_millis(946684800 * 1000 + 1_010)),
+                "'2000-01-01 00:00:01.01'",
+            ),
+            (None, "NULL"),
+        ],
+    );
+}
diff --git a/tokio-postgres/tests/types/serde_json_1.rs b/tokio-postgres/tests/types/serde_json_1.rs
new file mode 100644
index 00000000..37d431f6
--- /dev/null
+++ b/tokio-postgres/tests/types/serde_json_1.rs
@@ -0,0 +1,39 @@
+use serde_json_1::Value;
+
+use crate::types::test_type;
+
+#[test]
+fn test_json_params() {
+    test_type(
+        "JSON",
+        &[
+            (
+                Some(serde_json_1::from_str::<Value>("[10, 11, 12]").unwrap()),
+                "'[10, 11, 12]'",
+            ),
+            (
+                Some(serde_json_1::from_str::<Value>("{\"f\": \"asd\"}").unwrap()),
+                "'{\"f\": \"asd\"}'",
+            ),
+            (None, "NULL"),
+        ],
+    )
+}
+
+#[test]
+fn test_jsonb_params() {
+    test_type(
+        "JSONB",
+        &[
+            (
+                Some(serde_json_1::from_str::<Value>("[10, 11, 12]").unwrap()),
+                "'[10, 11, 12]'",
+            ),
+            (
+                Some(serde_json_1::from_str::<Value>("{\"f\": \"asd\"}").unwrap()),
+                "'{\"f\": \"asd\"}'",
+            ),
+            (None, "NULL"),
+        ],
+    )
+}
diff --git a/tokio-postgres/tests/types/uuid_07.rs b/tokio-postgres/tests/types/uuid_07.rs
new file mode 100644
index 00000000..1d51a8ad
--- /dev/null
+++ b/tokio-postgres/tests/types/uuid_07.rs
@@ -0,0 +1,17 @@
+use uuid_07::Uuid;
+
+use crate::types::test_type;
+
+#[test]
+fn test_uuid_params() {
+    test_type(
+        "UUID",
+        &[
+            (
+                Some(Uuid::parse_str("a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11").unwrap()),
+                "'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'",
+            ),
+            (None, "NULL"),
+        ],
+    )
+}