diff --git a/.travis.yml b/.travis.yml
index 66300e1ce..810995dfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ rust:
   - nightly
   - beta
   - stable
-script:
-  - make test
-  - cd idna && cargo test
+script: make test
 notifications:
   webhooks: http://build.servo.org:54856/travis
diff --git a/Cargo.toml b/Cargo.toml
index d0b4d573d..5ac4c7c66 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,9 @@ readme = "README.md"
 keywords = ["url", "parser"]
 license = "MIT/Apache-2.0"
 
+[workspace]
+members = [".", "idna"]
+
 [[test]]
 name = "unit"
 
diff --git a/Makefile b/Makefile
index c6f1ff0c9..c9592e735 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 test:
 	cargo test --features "query_encoding serde rustc-serialize"
 	[ x$$TRAVIS_RUST_VERSION != xnightly ] || cargo test --features heapsize
+	(cd idna && cargo test)
 
 .PHONY: test