diff --git a/Cargo.toml b/Cargo.toml
index d0b4d573..5ac4c7c6 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 c6f1ff0c..c9592e73 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
diff --git a/idna/tests/uts46.rs b/idna/tests/uts46.rs
index f660559f..ddc8af98 100644
--- a/idna/tests/uts46.rs
+++ b/idna/tests/uts46.rs
@@ -56,6 +56,13 @@ pub fn collect_tests<F: FnMut(String, TestFn)>(add_test: &mut F) {
                     // for these contexts
                     return;
                 }
+                if to_ascii == "[V2]" {
+                    // Everybody ignores V2
+                    // https://github.com/servo/rust-url/pull/240
+                    // https://github.com/whatwg/url/issues/53#issuecomment-181528158
+                    // http://www.unicode.org/review/pri317/
+                    return;
+                }
                 let res = result.ok();
                 assert!(res == None, "Expected error. result: {} | original: {} | source: {}",
                         res.unwrap(), original, source);