diff --git a/.travis.yml b/.travis.yml
index a95e1435..14ab0ebd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,9 @@ script:
 - (cd serde && travis-cargo build -- --no-default-features)
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features alloc)
 - (cd serde && travis-cargo --only nightly build -- --no-default-features --features collections)
-- (cd test-suite && travis-cargo --only beta test)
-- (cd test-suite && travis-cargo --only nightly test -- --features unstable-testing)
-- (cd test-suite/no-std-tests && travis-cargo --only nightly build)
+- (cd test_suite && travis-cargo --only beta test)
+- (cd test_suite && travis-cargo --only nightly test -- --features unstable-testing)
+- (cd test_suite/no-std-tests && travis-cargo --only nightly build)
 - (cd serde && travis-cargo --only stable doc)
 env:
   global:
diff --git a/test-suite/Cargo.toml b/test_suite/Cargo.toml
similarity index 100%
rename from test-suite/Cargo.toml
rename to test_suite/Cargo.toml
diff --git a/test-suite/no-std-tests/Cargo.toml b/test_suite/no-std-tests/Cargo.toml
similarity index 100%
rename from test-suite/no-std-tests/Cargo.toml
rename to test_suite/no-std-tests/Cargo.toml
diff --git a/test-suite/no-std-tests/src/main.rs b/test_suite/no-std-tests/src/main.rs
similarity index 100%
rename from test-suite/no-std-tests/src/main.rs
rename to test_suite/no-std-tests/src/main.rs
diff --git a/test-suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs
similarity index 100%
rename from test-suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs
rename to test_suite/tests/compile-fail/duplicate-attribute/rename-and-ser.rs
diff --git a/test-suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs
similarity index 100%
rename from test-suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs
rename to test_suite/tests/compile-fail/duplicate-attribute/rename-rename-de.rs
diff --git a/test-suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs
similarity index 100%
rename from test-suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs
rename to test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename-ser.rs
diff --git a/test-suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs
similarity index 100%
rename from test-suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs
rename to test_suite/tests/compile-fail/duplicate-attribute/rename-ser-rename.rs
diff --git a/test-suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs
similarity index 100%
rename from test-suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs
rename to test_suite/tests/compile-fail/duplicate-attribute/rename-ser-ser.rs
diff --git a/test-suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs b/test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs
similarity index 100%
rename from test-suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs
rename to test_suite/tests/compile-fail/duplicate-attribute/two-rename-ser.rs
diff --git a/test-suite/tests/compile-fail/str_ref_deser.rs b/test_suite/tests/compile-fail/str_ref_deser.rs
similarity index 100%
rename from test-suite/tests/compile-fail/str_ref_deser.rs
rename to test_suite/tests/compile-fail/str_ref_deser.rs
diff --git a/test-suite/tests/compile-fail/unknown-attribute/container.rs b/test_suite/tests/compile-fail/unknown-attribute/container.rs
similarity index 100%
rename from test-suite/tests/compile-fail/unknown-attribute/container.rs
rename to test_suite/tests/compile-fail/unknown-attribute/container.rs
diff --git a/test-suite/tests/compile-fail/unknown-attribute/field.rs b/test_suite/tests/compile-fail/unknown-attribute/field.rs
similarity index 100%
rename from test-suite/tests/compile-fail/unknown-attribute/field.rs
rename to test_suite/tests/compile-fail/unknown-attribute/field.rs
diff --git a/test-suite/tests/compile-fail/unknown-attribute/variant.rs b/test_suite/tests/compile-fail/unknown-attribute/variant.rs
similarity index 100%
rename from test-suite/tests/compile-fail/unknown-attribute/variant.rs
rename to test_suite/tests/compile-fail/unknown-attribute/variant.rs
diff --git a/test-suite/tests/compile_tests.rs b/test_suite/tests/compile_tests.rs
similarity index 100%
rename from test-suite/tests/compile_tests.rs
rename to test_suite/tests/compile_tests.rs
diff --git a/test-suite/tests/macros.rs b/test_suite/tests/macros.rs
similarity index 100%
rename from test-suite/tests/macros.rs
rename to test_suite/tests/macros.rs
diff --git a/test-suite/tests/run-pass/identity-op.rs b/test_suite/tests/run-pass/identity-op.rs
similarity index 100%
rename from test-suite/tests/run-pass/identity-op.rs
rename to test_suite/tests/run-pass/identity-op.rs
diff --git a/test-suite/tests/test.rs b/test_suite/tests/test.rs
similarity index 100%
rename from test-suite/tests/test.rs
rename to test_suite/tests/test.rs
diff --git a/test-suite/tests/test_annotations.rs b/test_suite/tests/test_annotations.rs
similarity index 100%
rename from test-suite/tests/test_annotations.rs
rename to test_suite/tests/test_annotations.rs
diff --git a/test-suite/tests/test_bytes.rs b/test_suite/tests/test_bytes.rs
similarity index 100%
rename from test-suite/tests/test_bytes.rs
rename to test_suite/tests/test_bytes.rs
diff --git a/test-suite/tests/test_de.rs b/test_suite/tests/test_de.rs
similarity index 100%
rename from test-suite/tests/test_de.rs
rename to test_suite/tests/test_de.rs
diff --git a/test-suite/tests/test_gen.rs b/test_suite/tests/test_gen.rs
similarity index 100%
rename from test-suite/tests/test_gen.rs
rename to test_suite/tests/test_gen.rs
diff --git a/test-suite/tests/test_macros.rs b/test_suite/tests/test_macros.rs
similarity index 100%
rename from test-suite/tests/test_macros.rs
rename to test_suite/tests/test_macros.rs
diff --git a/test-suite/tests/test_ser.rs b/test_suite/tests/test_ser.rs
similarity index 100%
rename from test-suite/tests/test_ser.rs
rename to test_suite/tests/test_ser.rs