diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index 0224abfa..745b4a85 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -17,6 +17,8 @@ use std::net::IpAddr;
 use std::sync::Arc;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
+#[cfg(feature = "with-serde_json-1")]
+pub use crate::serde_json_1::Json;
 use crate::type_gen::{Inner, Other};
 
 #[doc(inline)]
@@ -94,9 +96,6 @@ mod uuid_07;
 mod special;
 mod type_gen;
 
-#[cfg(feature = "with-serde_json-1")]
-pub use crate::types::serde_json_1::Json;
-
 /// A Postgres type.
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub struct Type(Inner);
diff --git a/postgres-types/src/uuid_07.rs b/postgres-types/src/uuid_07.rs
index c78d8a72..95199231 100644
--- a/postgres-types/src/uuid_07.rs
+++ b/postgres-types/src/uuid_07.rs
@@ -2,7 +2,7 @@ use postgres_protocol::types;
 use std::error::Error;
 use uuid_07::Uuid;
 
-use crate::types::{FromSql, IsNull, ToSql, Type};
+use crate::{FromSql, IsNull, ToSql, Type};
 
 impl<'a> FromSql<'a> for Uuid {
     fn from_sql(_: &Type, raw: &[u8]) -> Result<Uuid, Box<dyn Error + Sync + Send>> {
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index ff83c50e..8b88aab8 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -49,3 +49,11 @@ lazy_static = { version = "1.0", optional = true }
 [dev-dependencies]
 tokio = "=0.2.0-alpha.6"
 env_logger = "0.5"
+
+bit-vec-06 = { version = "0.6", package = "bit-vec" }
+chrono-04 = { version = "0.4", package = "chrono" }
+eui48-04 = { version = "0.4", package = "eui48" }
+geo-types-04 = { version = "0.4", package = "geo-types" }
+serde-1 = { version = "1.0", package = "serde" }
+serde_json-1 = { version = "1.0", package = "serde_json" }
+uuid-07 = { version = "0.7", package = "uuid" }