diff --git a/ci.sh b/ci.sh
index f93c218f1b0..67cbed4f826 100755
--- a/ci.sh
+++ b/ci.sh
@@ -80,7 +80,7 @@ case $HOST_TARGET in
     MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests
     MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
     MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
-    MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec current_dir data_race env
+    MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec data_race env/var
     MIRI_TEST_TARGET=thumbv7em-none-eabihf MIRI_NO_STD=1 run_tests_minimal no_std # no_std embedded architecture
     ;;
   x86_64-apple-darwin)
diff --git a/tests/pass/args.rs b/tests/pass/env/args.rs
similarity index 100%
rename from tests/pass/args.rs
rename to tests/pass/env/args.rs
diff --git a/tests/pass/args.stdout b/tests/pass/env/args.stdout
similarity index 100%
rename from tests/pass/args.stdout
rename to tests/pass/env/args.stdout
diff --git a/tests/pass/current_dir.rs b/tests/pass/env/current_dir.rs
similarity index 100%
rename from tests/pass/current_dir.rs
rename to tests/pass/env/current_dir.rs
diff --git a/tests/pass/current_dir_with_isolation.rs b/tests/pass/env/current_dir_with_isolation.rs
similarity index 100%
rename from tests/pass/current_dir_with_isolation.rs
rename to tests/pass/env/current_dir_with_isolation.rs
diff --git a/tests/pass/current_dir_with_isolation.stderr b/tests/pass/env/current_dir_with_isolation.stderr
similarity index 100%
rename from tests/pass/current_dir_with_isolation.stderr
rename to tests/pass/env/current_dir_with_isolation.stderr
diff --git a/tests/pass/current_exe.rs b/tests/pass/env/current_exe.rs
similarity index 68%
rename from tests/pass/current_exe.rs
rename to tests/pass/env/current_exe.rs
index 64f62b230e4..15ea6a52b7b 100644
--- a/tests/pass/current_exe.rs
+++ b/tests/pass/env/current_exe.rs
@@ -1,4 +1,5 @@
 //@ignore-target-windows
+//@only-on-host: the Linux std implementation opens /proc/self/exe, which doesn't work cross-target
 //@compile-flags: -Zmiri-disable-isolation
 use std::env;
 
diff --git a/tests/pass/home.rs b/tests/pass/env/home.rs
similarity index 100%
rename from tests/pass/home.rs
rename to tests/pass/env/home.rs
diff --git a/tests/pass/env-exclude.rs b/tests/pass/env/var-exclude.rs
similarity index 100%
rename from tests/pass/env-exclude.rs
rename to tests/pass/env/var-exclude.rs
diff --git a/tests/pass/env-forward.rs b/tests/pass/env/var-forward.rs
similarity index 100%
rename from tests/pass/env-forward.rs
rename to tests/pass/env/var-forward.rs
diff --git a/tests/pass/env-without-isolation.rs b/tests/pass/env/var-without-isolation.rs
similarity index 100%
rename from tests/pass/env-without-isolation.rs
rename to tests/pass/env/var-without-isolation.rs
diff --git a/tests/pass/env.rs b/tests/pass/env/var.rs
similarity index 100%
rename from tests/pass/env.rs
rename to tests/pass/env/var.rs
diff --git a/tests/pass/env.stdout b/tests/pass/env/var.stdout
similarity index 100%
rename from tests/pass/env.stdout
rename to tests/pass/env/var.stdout
diff --git a/tests/pass/libc.rs b/tests/pass/libc.rs
index 468da0845a8..b5848560214 100644
--- a/tests/pass/libc.rs
+++ b/tests/pass/libc.rs
@@ -88,7 +88,7 @@ fn test_posix_realpath_errors() {
     assert_eq!(e.kind(), ErrorKind::NotFound);
 }
 
-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+#[cfg(any(target_os = "linux"))]
 fn test_posix_fadvise() {
     use std::convert::TryInto;
     use std::io::Write;
@@ -452,7 +452,7 @@ fn test_posix_mkstemp() {
 }
 
 fn main() {
-    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+    #[cfg(any(target_os = "linux"))]
     test_posix_fadvise();
 
     test_posix_gettimeofday();