diff --git a/src/main.rs b/src/main.rs
index bb1223aba0..1e81f4dd00 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -49,8 +49,8 @@
 #![feature(naked_functions)]
 #![feature(sync_unsafe_cell)]
 #![feature(variant_count)]
-#![no_std]
-#![no_main]
+#![cfg_attr(not(test), no_std)]
+#![cfg_attr(not(test), no_main)]
 
 #[macro_use]
 extern crate alloc;
@@ -147,11 +147,7 @@ mod syscall;
 /// Time
 mod time;
 
-/// Tests
-#[cfg(test)]
-mod tests;
-
-#[global_allocator]
+#[cfg_attr(not(test), global_allocator)]
 static ALLOCATOR: allocator::Allocator = allocator::Allocator;
 
 /// Get the current CPU's scheduling ID
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
deleted file mode 100644
index 3432dcd830..0000000000
--- a/src/tests/mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use syscall::{self, Error};
-
-/// Test stdio
-#[test]
-fn stdio() {
-    // Test opening stdin
-    assert_eq!(syscall::open(b"debug:", 0), Ok(0));
-
-    // Test opening stdout
-    assert_eq!(syscall::open(b"debug:", 0), Ok(1));
-
-    // Test opening stderr
-    assert_eq!(syscall::open(b"debug:", 0), Ok(2));
-
-    // Test writing stdout
-    let stdout_str = b"STDOUT";
-    assert_eq!(syscall::write(1, stdout_str), Ok(stdout_str.len()));
-
-    // Test writing stderr
-    let stderr_str = b"STDERR";
-    assert_eq!(syscall::write(2, stderr_str), Ok(stderr_str.len()));
-}
-
-/// Test that invalid reads/writes cause errors
-#[test]
-fn invalid_path() {
-    assert_eq!(syscall::read(999, &mut []), Err(Error::new(syscall::EBADF)));
-    assert_eq!(syscall::write(999, &[]), Err(Error::new(syscall::EBADF)));
-}
diff --git a/syscall b/syscall
index c751f76248..e4cc6bfcd5 160000
--- a/syscall
+++ b/syscall
@@ -1 +1 @@
-Subproject commit c751f762485ae5dd4862c47019e58d5d859c80d8
+Subproject commit e4cc6bfcd5865843ac750278c743b638f3d77429