diff --git a/test/choosetests.jl b/test/choosetests.jl
index e0eba43004ae9..2ab565372c64d 100644
--- a/test/choosetests.jl
+++ b/test/choosetests.jl
@@ -51,9 +51,9 @@ function choosetests(choices = [])
         "some", "meta", "stacktraces", "docs",
         "misc", "threads", "stress",
         "enums", "cmdlineargs", "int",
-        "checked", "bitset", "floatfuncs", "precompile", "inline",
+        "checked", "bitset", "floatfuncs", "precompile",
         "boundscheck", "error", "ambiguous", "cartesian", "osutils",
-        "channels", "iostream", "secretbuffer", "specificity", "codegen",
+        "channels", "iostream", "secretbuffer", "specificity",
         "reinterpretarray", "syntax", "logging", "missing", "asyncmap"
     ]
 
@@ -107,7 +107,8 @@ function choosetests(choices = [])
         prepend!(tests, ["subarray"])
     end
 
-    compilertests = ["compiler/compiler", "compiler/validation", "compiler/ssair", "compiler/irpasses"]
+    compilertests = ["compiler/inference", "compiler/validation", "compiler/ssair", "compiler/irpasses",
+                     "compiler/codegen", "compiler/inline"]
 
     if "compiler" in skip_tests
         filter!(x -> (x != "compiler" && !(x in compilertests)), tests)
diff --git a/test/codegen.jl b/test/compiler/codegen.jl
similarity index 100%
rename from test/codegen.jl
rename to test/compiler/codegen.jl
diff --git a/test/compiler/compiler.jl b/test/compiler/inference.jl
similarity index 100%
rename from test/compiler/compiler.jl
rename to test/compiler/inference.jl
diff --git a/test/inline.jl b/test/compiler/inline.jl
similarity index 100%
rename from test/inline.jl
rename to test/compiler/inline.jl