diff --git a/test_bds_2d/GNUmakefile b/test_bds_2d/GNUmakefile
deleted file mode 100644
index a047e6add..000000000
--- a/test_bds_2d/GNUmakefile
+++ /dev/null
@@ -1,27 +0,0 @@
-AMREX_HOME ?= ../../amrex
-AMREX_HYDRO_HOME ?= ../../AMReX-Hydro
-TOP = ..
-
-EBASE = incflo
-
-DIM = 2
-
-PRECISION  = DOUBLE
-
-TINY_PROFILE = FALSE
-
-DEBUG      = TRUE
-DEBUG      = FALSE
-
-COMP	   = gnu
-
-USE_MPI    = TRUE
-USE_OMP    = FALSE
-USE_CUDA   = FALSE
-
-USE_HYPRE = FALSE
-BL_NO_FORT = TRUE
-
-USE_EB = FALSE
-
-include ../src/Make.incflo
diff --git a/test_bds_3d/GNUmakefile b/test_bds_3d/GNUmakefile
deleted file mode 100644
index 0d06093b9..000000000
--- a/test_bds_3d/GNUmakefile
+++ /dev/null
@@ -1,27 +0,0 @@
-AMREX_HOME ?= ../../amrex
-AMREX_HYDRO_HOME ?= ../../AMReX-Hydro
-TOP = ..
-
-EBASE = incflo
-
-DIM = 3
-
-PRECISION  = DOUBLE
-
-TINY_PROFILE = FALSE
-
-DEBUG      = TRUE
-DEBUG      = FALSE
-
-COMP	   = gnu
-
-USE_MPI    = TRUE
-USE_OMP    = FALSE
-USE_CUDA   = FALSE
-
-USE_HYPRE = FALSE
-BL_NO_FORT = TRUE
-
-USE_EB = FALSE
-
-include ../src/Make.incflo
diff --git a/test_bds_2d/inputs.circ_traceradvect b/test_no_eb_2d/inputs.circ_traceradect_bds
similarity index 100%
rename from test_bds_2d/inputs.circ_traceradvect
rename to test_no_eb_2d/inputs.circ_traceradect_bds
diff --git a/test_bds_2d/inputs.gaussian_traceradvect b/test_no_eb_2d/inputs.gaussian_traceradvect_bds
similarity index 100%
rename from test_bds_2d/inputs.gaussian_traceradvect
rename to test_no_eb_2d/inputs.gaussian_traceradvect_bds
diff --git a/test_bds_3d/inputs.gaussian_traceradvect b/test_no_eb_3d/inputs.gaussian_traceradvect_bds
similarity index 100%
rename from test_bds_3d/inputs.gaussian_traceradvect
rename to test_no_eb_3d/inputs.gaussian_traceradvect_bds
diff --git a/test_bds_3d/inputs.circ_traceradvect b/test_no_eb_3d/inputs_circ_traceradvect_bds
similarity index 100%
rename from test_bds_3d/inputs.circ_traceradvect
rename to test_no_eb_3d/inputs_circ_traceradvect_bds