diff --git a/tests/e2e/build/macros/BUCK b/tests/core/build/macros/BUCK
similarity index 100%
rename from tests/e2e/build/macros/BUCK
rename to tests/core/build/macros/BUCK
diff --git a/tests/e2e/build/macros/test_macros.py b/tests/core/build/macros/test_macros.py
similarity index 95%
rename from tests/e2e/build/macros/test_macros.py
rename to tests/core/build/macros/test_macros.py
index 79f3ce3c2157..49fb7c4048ec 100644
--- a/tests/e2e/build/macros/test_macros.py
+++ b/tests/core/build/macros/test_macros.py
@@ -15,7 +15,7 @@
 from buck2.tests.e2e_util.buck_workspace import buck_test
 
 
-@buck_test(inplace=False)
+@buck_test()
 async def test_run_with_source_macros(buck: Buck) -> None:
     sep = "\\" if platform.system() == "Windows" else "/"
     result = await buck.run("//source:echo_file")
@@ -31,7 +31,7 @@ async def test_run_with_source_macros(buck: Buck) -> None:
     assert result.stdout == "bar file\n"
 
 
-@buck_test(inplace=False)
+@buck_test()
 async def test_no_dep_in_source(buck: Buck) -> None:
     await expect_failure(
         buck.build("//dep_as_source:uses_dep"),
diff --git a/tests/e2e/build/macros/test_macros_data/.buckconfig b/tests/core/build/macros/test_macros_data/.buckconfig
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/.buckconfig
rename to tests/core/build/macros/test_macros_data/.buckconfig
diff --git a/tests/e2e/build/macros/test_macros_data/.buckroot b/tests/core/build/macros/test_macros_data/.buckroot
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/.buckroot
rename to tests/core/build/macros/test_macros_data/.buckroot
diff --git a/tests/e2e/build/macros/test_macros_data/dep_as_source/TARGETS.fixture b/tests/core/build/macros/test_macros_data/dep_as_source/TARGETS.fixture
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/dep_as_source/TARGETS.fixture
rename to tests/core/build/macros/test_macros_data/dep_as_source/TARGETS.fixture
diff --git a/tests/e2e/build/macros/test_macros_data/dep_as_source/defs.bzl b/tests/core/build/macros/test_macros_data/dep_as_source/defs.bzl
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/dep_as_source/defs.bzl
rename to tests/core/build/macros/test_macros_data/dep_as_source/defs.bzl
diff --git a/tests/e2e/build/macros/test_macros_data/prelude/prelude.bzl b/tests/core/build/macros/test_macros_data/prelude/prelude.bzl
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/prelude/prelude.bzl
rename to tests/core/build/macros/test_macros_data/prelude/prelude.bzl
diff --git a/tests/e2e/build/macros/test_macros_data/source/TARGETS.fixture b/tests/core/build/macros/test_macros_data/source/TARGETS.fixture
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/source/TARGETS.fixture
rename to tests/core/build/macros/test_macros_data/source/TARGETS.fixture
diff --git a/tests/e2e/build/macros/test_macros_data/source/bar/bar.txt b/tests/core/build/macros/test_macros_data/source/bar/bar.txt
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/source/bar/bar.txt
rename to tests/core/build/macros/test_macros_data/source/bar/bar.txt
diff --git a/tests/e2e/build/macros/test_macros_data/source/defs.bzl b/tests/core/build/macros/test_macros_data/source/defs.bzl
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/source/defs.bzl
rename to tests/core/build/macros/test_macros_data/source/defs.bzl
diff --git a/tests/e2e/build/macros/test_macros_data/source/foo.txt b/tests/core/build/macros/test_macros_data/source/foo.txt
similarity index 100%
rename from tests/e2e/build/macros/test_macros_data/source/foo.txt
rename to tests/core/build/macros/test_macros_data/source/foo.txt
diff --git a/tests/e2e/build/macros/test_write_to_file_macros.py b/tests/core/build/macros/test_write_to_file_macros.py
similarity index 99%
rename from tests/e2e/build/macros/test_write_to_file_macros.py
rename to tests/core/build/macros/test_write_to_file_macros.py
index 0deb560762f8..94721fb4dc60 100644
--- a/tests/e2e/build/macros/test_write_to_file_macros.py
+++ b/tests/core/build/macros/test_write_to_file_macros.py
@@ -31,7 +31,7 @@ def _find_file(dir, name: str):
     return f
 
 
-@buck_test(inplace=False)
+@buck_test()
 async def test_xxx(buck: Buck) -> None:
     result = await buck.build("//:test_rule")
     out = result.get_build_report().output_for_target("root//:test_rule")
diff --git a/tests/e2e/build/macros/test_write_to_file_macros_data/.buckconfig b/tests/core/build/macros/test_write_to_file_macros_data/.buckconfig
similarity index 100%
rename from tests/e2e/build/macros/test_write_to_file_macros_data/.buckconfig
rename to tests/core/build/macros/test_write_to_file_macros_data/.buckconfig
diff --git a/tests/e2e/build/macros/test_write_to_file_macros_data/.buckroot b/tests/core/build/macros/test_write_to_file_macros_data/.buckroot
similarity index 100%
rename from tests/e2e/build/macros/test_write_to_file_macros_data/.buckroot
rename to tests/core/build/macros/test_write_to_file_macros_data/.buckroot
diff --git a/tests/e2e/build/macros/test_write_to_file_macros_data/TARGETS.fixture b/tests/core/build/macros/test_write_to_file_macros_data/TARGETS.fixture
similarity index 100%
rename from tests/e2e/build/macros/test_write_to_file_macros_data/TARGETS.fixture
rename to tests/core/build/macros/test_write_to_file_macros_data/TARGETS.fixture
diff --git a/tests/e2e/build/macros/test_write_to_file_macros_data/defs.bzl b/tests/core/build/macros/test_write_to_file_macros_data/defs.bzl
similarity index 100%
rename from tests/e2e/build/macros/test_write_to_file_macros_data/defs.bzl
rename to tests/core/build/macros/test_write_to_file_macros_data/defs.bzl