diff --git a/tokio-postgres/tests/test.rs b/tokio-postgres/tests/test/main.rs
similarity index 100%
rename from tokio-postgres/tests/test.rs
rename to tokio-postgres/tests/test/main.rs
diff --git a/tokio-postgres/tests/types/bit_vec_07.rs b/tokio-postgres/tests/test/types/bit_vec_07.rs
similarity index 100%
rename from tokio-postgres/tests/types/bit_vec_07.rs
rename to tokio-postgres/tests/test/types/bit_vec_07.rs
diff --git a/tokio-postgres/tests/types/chrono_04.rs b/tokio-postgres/tests/test/types/chrono_04.rs
similarity index 100%
rename from tokio-postgres/tests/types/chrono_04.rs
rename to tokio-postgres/tests/test/types/chrono_04.rs
diff --git a/tokio-postgres/tests/types/eui48_04.rs b/tokio-postgres/tests/test/types/eui48_04.rs
similarity index 100%
rename from tokio-postgres/tests/types/eui48_04.rs
rename to tokio-postgres/tests/test/types/eui48_04.rs
diff --git a/tokio-postgres/tests/types/geo_010.rs b/tokio-postgres/tests/test/types/geo_010.rs
similarity index 100%
rename from tokio-postgres/tests/types/geo_010.rs
rename to tokio-postgres/tests/test/types/geo_010.rs
diff --git a/tokio-postgres/tests/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
similarity index 100%
rename from tokio-postgres/tests/types/mod.rs
rename to tokio-postgres/tests/test/types/mod.rs
diff --git a/tokio-postgres/tests/types/serde_json_1.rs b/tokio-postgres/tests/test/types/serde_json_1.rs
similarity index 100%
rename from tokio-postgres/tests/types/serde_json_1.rs
rename to tokio-postgres/tests/test/types/serde_json_1.rs
diff --git a/tokio-postgres/tests/types/uuid_07.rs b/tokio-postgres/tests/test/types/uuid_07.rs
similarity index 100%
rename from tokio-postgres/tests/types/uuid_07.rs
rename to tokio-postgres/tests/test/types/uuid_07.rs