diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f7e517..1acfe82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.22'
+        go-version: '1.23'
 
     - name: Build
       run: make build
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index c1bdbfc..d958a81 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -22,9 +22,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.55.2
+          version: v1.60.3
diff --git a/.gitmodules b/.gitmodules
index b8545e0..92087ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "vendor/gameboy-doctor"]
-	path = vendor/gameboy-doctor
+	path = tests/gameboy-doctor
 	url = git@github.com:robert/gameboy-doctor.git
 [submodule "vendor/gb-test-roms"]
-	path = vendor/gb-test-roms
+	path = tests/gb-test-roms
 	url = git@github.com:retrio/gb-test-roms.git
diff --git a/.tool-versions b/.tool-versions
index f526442..c9953ae 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-golang 1.22.0
+golang 1.23.1
diff --git a/Makefile b/Makefile
index 78a3a63..8a8e7a7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ help:
 
 .PHONY: tidy
 tidy:
-	go fmt -mod=mod ./...
+	go fmt ./...
 	go mod tidy -v
 
 .PHONY: build
@@ -29,18 +29,18 @@ clean:
 
 .PHONY: run
 run:
-	$(GO) run -mod=mod .
+	$(GO) run .
 
 .PHONY: test
 test:
-	$(GO) test -mod=mod -v ./...
+	$(GO) test -v ./...
 
 .PHONY: bin/gogo-gb # This does exist, but we're not tracking its dependencies. Go is
 bin/gogo-gb:
-	$(GO) build -mod=mod -o bin/gogo-gb .
+	$(GO) build -o bin/gogo-gb .
 
 .PHONY: cpu_instrs
-cpu_instrs: bin/gogo-gb vendor/gameboy-doctor/gameboy-doctor vendor/gb-test-roms/cpu_instrs/individual/*.gb
+cpu_instrs: bin/gogo-gb tests/gameboy-doctor/gameboy-doctor tests/gb-test-roms/cpu_instrs/individual/*.gb
 #  These are broken upstream:
 #    02-interrupts.gb
 	@CPU_TESTS=( \
@@ -59,18 +59,18 @@ cpu_instrs: bin/gogo-gb vendor/gameboy-doctor/gameboy-doctor vendor/gb-test-roms
     test_name=$${file%*.gb}; \
     test_num=$$((10#$${test_name%-*})); \
     echo "=== Starting cpu_instrs test $$file ==="; \
-    bin/gogo-gb --cart "vendor/gb-test-roms/cpu_instrs/individual/$$file" \
+    bin/gogo-gb --cart "tests/gb-test-roms/cpu_instrs/individual/$$file" \
                 --debugger=gameboy-doctor \
                 --log=stderr | \
-      ./vendor/gameboy-doctor/gameboy-doctor - cpu_instrs "$$test_num" || \
+      ./tests/gameboy-doctor/gameboy-doctor - cpu_instrs "$$test_num" || \
       { ec=$$?; [ $$ec -eq 141 ] && true || (exit $$ec); }; \
     echo "=== Finished cpu_instrs test $$file ===" ; \
   done
 
-vendor/gameboy-doctor/gameboy-doctor:
+tests/gameboy-doctor/gameboy-doctor:
 	git submodule init
 	git submodule update
 
-vendor/gb-test-roms/cpu_instrs/individual/*.gb:
+tests/gb-test-roms/cpu_instrs/individual/*.gb:
 	git submodule init
 	git submodule update
diff --git a/go.mod b/go.mod
index 728c330..4f4e36b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/maxfierke/gogo-gb
 
-go 1.22.0
+go 1.23.0
 
 require (
 	github.com/hajimehoshi/ebiten/v2 v2.7.3
diff --git a/go.sum b/go.sum
index 949aa33..f4c4d8f 100644
--- a/go.sum
+++ b/go.sum
@@ -20,6 +20,7 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/vendor/gameboy-doctor b/tests/gameboy-doctor
similarity index 100%
rename from vendor/gameboy-doctor
rename to tests/gameboy-doctor
diff --git a/vendor/gb-test-roms b/tests/gb-test-roms
similarity index 100%
rename from vendor/gb-test-roms
rename to tests/gb-test-roms