diff --git a/Cargo.toml b/Cargo.toml
index c9526112e..5bd604475 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,5 +16,5 @@ members = [
   "tokio-timer",
   "tokio-tls",
   "tokio-uds",
-  "ui-tests",
+  "build-tests",
 ]
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8c9edd8ed..bd6fe8810 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -83,7 +83,7 @@ jobs:
     displayName: Test feature flags
     rust: $(nightly)
     crates:
-      ui-tests:
+      build-tests:
         - tokio-executor
         - tokio-net
         - executor-without-current-thread
diff --git a/ui-tests/Cargo.toml b/build-tests/Cargo.toml
similarity index 89%
rename from ui-tests/Cargo.toml
rename to build-tests/Cargo.toml
index dab3a64c3..d08dcd628 100644
--- a/ui-tests/Cargo.toml
+++ b/build-tests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "ui-tests"
+name = "build-tests"
 version = "0.1.0"
-authors = ["Carl Lerche <me@carllerche.com>"]
+authors = ["Tokio Contributors <team@tokio.rs>"]
 edition = "2018"
 publish = false
 
diff --git a/ui-tests/README.md b/build-tests/README.md
similarity index 100%
rename from ui-tests/README.md
rename to build-tests/README.md
diff --git a/ui-tests/src/lib.rs b/build-tests/src/lib.rs
similarity index 100%
rename from ui-tests/src/lib.rs
rename to build-tests/src/lib.rs
diff --git a/build-tests/tests/fail/executor_without_current_thread.rs b/build-tests/tests/fail/executor_without_current_thread.rs
new file mode 100644
index 000000000..469bd9661
--- /dev/null
+++ b/build-tests/tests/fail/executor_without_current_thread.rs
@@ -0,0 +1,3 @@
+use build_tests::tokio_executor::current_thread;
+
+fn main() {}
diff --git a/build-tests/tests/fail/executor_without_current_thread.stderr b/build-tests/tests/fail/executor_without_current_thread.stderr
new file mode 100644
index 000000000..13c2156f3
--- /dev/null
+++ b/build-tests/tests/fail/executor_without_current_thread.stderr
@@ -0,0 +1,7 @@
+error[E0432]: unresolved import `build_tests::tokio_executor::current_thread`
+ --> $DIR/executor_without_current_thread.rs:1:5
+  |
+1 | use build_tests::tokio_executor::current_thread;
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `current_thread` in `tokio_executor`
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/build-tests/tests/fail/net_without_tcp_missing_tcp.rs b/build-tests/tests/fail/net_without_tcp_missing_tcp.rs
new file mode 100644
index 000000000..c407e4abf
--- /dev/null
+++ b/build-tests/tests/fail/net_without_tcp_missing_tcp.rs
@@ -0,0 +1,4 @@
+use build_tests::tokio_net::tcp;
+
+fn main() {}
+
diff --git a/build-tests/tests/fail/net_without_tcp_missing_tcp.stderr b/build-tests/tests/fail/net_without_tcp_missing_tcp.stderr
new file mode 100644
index 000000000..84e5a37b3
--- /dev/null
+++ b/build-tests/tests/fail/net_without_tcp_missing_tcp.stderr
@@ -0,0 +1,7 @@
+error[E0432]: unresolved import `build_tests::tokio_net::tcp`
+ --> $DIR/net_without_tcp_missing_tcp.rs:1:5
+  |
+1 | use build_tests::tokio_net::tcp;
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `tcp` in `tokio_net`
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/build-tests/tests/fail/net_without_udp_missing_udp.rs b/build-tests/tests/fail/net_without_udp_missing_udp.rs
new file mode 100644
index 000000000..56b726d24
--- /dev/null
+++ b/build-tests/tests/fail/net_without_udp_missing_udp.rs
@@ -0,0 +1,4 @@
+use build_tests::tokio_net::udp;
+
+fn main() {}
+
diff --git a/build-tests/tests/fail/net_without_udp_missing_udp.stderr b/build-tests/tests/fail/net_without_udp_missing_udp.stderr
new file mode 100644
index 000000000..9ab2e8ba2
--- /dev/null
+++ b/build-tests/tests/fail/net_without_udp_missing_udp.stderr
@@ -0,0 +1,7 @@
+error[E0432]: unresolved import `build_tests::tokio_net::udp`
+ --> $DIR/net_without_udp_missing_udp.rs:1:5
+  |
+1 | use build_tests::tokio_net::udp;
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `udp` in `tokio_net`
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/build-tests/tests/fail/tokio_without_net_missing_net.rs b/build-tests/tests/fail/tokio_without_net_missing_net.rs
new file mode 100644
index 000000000..db5debe9c
--- /dev/null
+++ b/build-tests/tests/fail/tokio_without_net_missing_net.rs
@@ -0,0 +1,3 @@
+use build_tests::tokio::net;
+
+fn main() {}
diff --git a/build-tests/tests/fail/tokio_without_net_missing_net.stderr b/build-tests/tests/fail/tokio_without_net_missing_net.stderr
new file mode 100644
index 000000000..234fcbb64
--- /dev/null
+++ b/build-tests/tests/fail/tokio_without_net_missing_net.stderr
@@ -0,0 +1,7 @@
+error[E0432]: unresolved import `build_tests::tokio::net`
+ --> $DIR/tokio_without_net_missing_net.rs:1:5
+  |
+1 | use build_tests::tokio::net;
+  |     ^^^^^^^^^^^^^^^^^^^^^^^ no `net` in `tokio`
+
+For more information about this error, try `rustc --explain E0432`.
diff --git a/ui-tests/tests/features.rs b/build-tests/tests/features.rs
similarity index 51%
rename from ui-tests/tests/features.rs
rename to build-tests/tests/features.rs
index 8a2ff29d9..bd00803f8 100644
--- a/ui-tests/tests/features.rs
+++ b/build-tests/tests/features.rs
@@ -3,43 +3,43 @@
 #[test]
 #[cfg(feature = "tokio-net")]
 fn net_default() {
-    use ui_tests::tokio_net::driver::{set_default, Handle, Reactor, Registration};
-    use ui_tests::tokio_net::util::PollEvented;
+    use build_tests::tokio_net::driver::{set_default, Handle, Reactor, Registration};
+    use build_tests::tokio_net::util::PollEvented;
 }
 
 #[test]
 #[cfg(feature = "net-with-tcp")]
 fn net_with_tcp() {
-    use ui_tests::tokio_net::tcp;
+    use build_tests::tokio_net::tcp;
 }
 
 #[test]
 #[cfg(feature = "net-with-udp")]
 fn net_with_udp() {
-    use ui_tests::tokio_net::udp;
+    use build_tests::tokio_net::udp;
 }
 
 #[test]
 #[cfg(feature = "tokio-with-net")]
 fn tokio_with_net() {
     // net is present
-    use ui_tests::tokio::net;
+    use build_tests::tokio::net;
 }
 #[test]
 fn compile_fail() {
     let t = trybuild::TestCases::new();
 
     #[cfg(feature = "executor-without-current-thread")]
-    t.compile_fail("tests/ui/executor_without_current_thread.rs");
+    t.compile_fail("tests/fail/executor_without_current_thread.rs");
 
     #[cfg(feature = "net-no-features")]
     {
-        t.compile_fail("tests/ui/net_without_tcp_missing_tcp.rs");
-        t.compile_fail("tests/ui/net_without_udp_missing_udp.rs");
+        t.compile_fail("tests/fail/net_without_tcp_missing_tcp.rs");
+        t.compile_fail("tests/fail/net_without_udp_missing_udp.rs");
     }
 
     #[cfg(feature = "tokio-no-features")]
-    t.compile_fail("tests/ui/tokio_without_net_missing_net.rs");
+    t.compile_fail("tests/fail/tokio_without_net_missing_net.rs");
 
     drop(t);
 }
diff --git a/ui-tests/tests/ui/executor_without_current_thread.rs b/ui-tests/tests/ui/executor_without_current_thread.rs
deleted file mode 100644
index 632200f89..000000000
--- a/ui-tests/tests/ui/executor_without_current_thread.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-use ui_tests::tokio_executor::current_thread;
-
-fn main() {}
diff --git a/ui-tests/tests/ui/executor_without_current_thread.stderr b/ui-tests/tests/ui/executor_without_current_thread.stderr
deleted file mode 100644
index 8ef8207f7..000000000
--- a/ui-tests/tests/ui/executor_without_current_thread.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0432]: unresolved import `ui_tests::tokio_executor::current_thread`
- --> $DIR/executor_without_current_thread.rs:1:5
-  |
-1 | use ui_tests::tokio_executor::current_thread;
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `current_thread` in `tokio_executor`
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/ui-tests/tests/ui/net_without_tcp_missing_tcp.rs b/ui-tests/tests/ui/net_without_tcp_missing_tcp.rs
deleted file mode 100644
index 6cb0027b5..000000000
--- a/ui-tests/tests/ui/net_without_tcp_missing_tcp.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use ui_tests::tokio_net::tcp;
-
-fn main() {}
-
diff --git a/ui-tests/tests/ui/net_without_tcp_missing_tcp.stderr b/ui-tests/tests/ui/net_without_tcp_missing_tcp.stderr
deleted file mode 100644
index 91fb4d895..000000000
--- a/ui-tests/tests/ui/net_without_tcp_missing_tcp.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0432]: unresolved import `ui_tests::tokio_net::tcp`
- --> $DIR/net_without_tcp_missing_tcp.rs:1:5
-  |
-1 | use ui_tests::tokio_net::tcp;
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ no `tcp` in `tokio_net`
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/ui-tests/tests/ui/net_without_udp_missing_udp.rs b/ui-tests/tests/ui/net_without_udp_missing_udp.rs
deleted file mode 100644
index 50dd18dbc..000000000
--- a/ui-tests/tests/ui/net_without_udp_missing_udp.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-use ui_tests::tokio_net::udp;
-
-fn main() {}
-
diff --git a/ui-tests/tests/ui/net_without_udp_missing_udp.stderr b/ui-tests/tests/ui/net_without_udp_missing_udp.stderr
deleted file mode 100644
index 3596f7b78..000000000
--- a/ui-tests/tests/ui/net_without_udp_missing_udp.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0432]: unresolved import `ui_tests::tokio_net::udp`
- --> $DIR/net_without_udp_missing_udp.rs:1:5
-  |
-1 | use ui_tests::tokio_net::udp;
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ no `udp` in `tokio_net`
-
-For more information about this error, try `rustc --explain E0432`.
diff --git a/ui-tests/tests/ui/tokio_without_net_missing_net.rs b/ui-tests/tests/ui/tokio_without_net_missing_net.rs
deleted file mode 100644
index c180712b1..000000000
--- a/ui-tests/tests/ui/tokio_without_net_missing_net.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-use ui_tests::tokio::net;
-
-fn main() {}
diff --git a/ui-tests/tests/ui/tokio_without_net_missing_net.stderr b/ui-tests/tests/ui/tokio_without_net_missing_net.stderr
deleted file mode 100644
index 741b11909..000000000
--- a/ui-tests/tests/ui/tokio_without_net_missing_net.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0432]: unresolved import `ui_tests::tokio::net`
- --> $DIR/tokio_without_net_missing_net.rs:1:5
-  |
-1 | use ui_tests::tokio::net;
-  |     ^^^^^^^^^^^^^^^^^^^^ no `net` in `tokio`
-
-For more information about this error, try `rustc --explain E0432`.