diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b55f8a9ab1..9fd8944d38 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,6 +40,9 @@ jobs:
         working-directory: agbcc
 
       - name: Agbcc
+        env:
+          MODERN: 0
+          COMPARE: 0
         run: make -j${nproc} -O all
 
       - name: Modern
@@ -50,7 +53,8 @@ jobs:
 
       - name: Test
         env:
+          MODERN: 1
           TEST: 1
         run: |
-          make -j${nproc} -O pokeemerald-test.elf
+          make -j${nproc} -O pokeemerald_modern-test.elf
           make -j${nproc} check
diff --git a/Makefile b/Makefile
index abd395c057..4b59c76f66 100644
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,12 @@ TITLE       := POKEMON EMER
 GAME_CODE   := BPEE
 MAKER_CODE  := 01
 REVISION    := 0
-MODERN      ?= 0
+MODERN      ?= 1
 TEST        ?= 0
 ANALYZE     ?= 0
 
-ifeq (modern,$(MAKECMDGOALS))
-  MODERN := 1
+ifeq (agbcc,$(MAKECMDGOALS))
+  MODERN := 0
 endif
 
 ifeq (check,$(MAKECMDGOALS))
@@ -182,7 +182,7 @@ MAKEFLAGS += --no-print-directory
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall modern tidymodern tidynonmodern check
+.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall agbcc modern tidymodern tidynonmodern check
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
@@ -190,7 +190,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
 # Disable dependency scanning for clean/tidy/tools
 # Use a separate minimal makefile for speed
 # Since we don't need to reload most of this makefile
-ifeq (,$(filter-out all rom compare modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
+ifeq (,$(filter-out all rom compare agbcc modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
 $(call infoshell, $(MAKE) -f make_tools.mk)
 else
 NODEP ?= 1
@@ -485,6 +485,8 @@ $(ROM): $(ELF)
 	$(OBJCOPY) -O binary $< $@
 	$(FIX) $@ -p --silent
 
+agbcc: all
+
 modern: all
 
 LD_SCRIPT_TEST := ld_script_test.txt