diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c43d8a..017fc2e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v2
 
       # TODO point to to rust3ds/test-runner once migrated
-      - uses: ian-h-chamberlain/test-runner-3ds/setup@v1
+      - uses: rust3ds/test-runner/setup@v1
         with:
           toolchain: ${{ matrix.toolchain }}
 
@@ -63,7 +63,7 @@ jobs:
       - name: Checkout branch
         uses: actions/checkout@v2
 
-      - uses: ian-h-chamberlain/test-runner-3ds/setup@v1
+      - uses: rust3ds/test-runner/setup@v1
         with:
           toolchain: ${{ matrix.toolchain }}
 
@@ -79,12 +79,12 @@ jobs:
         run: cargo 3ds test --no-run --tests --package ctru-rs
 
       - name: Run lib and integration tests
-        uses: ian-h-chamberlain/test-runner-3ds/run-tests@v1
+        uses: rust3ds/test-runner/run-tests@v1
         with:
           args: --tests --package ctru-rs
 
       - name: Build and run doc tests
-        uses: ian-h-chamberlain/test-runner-3ds/run-tests@v1
+        uses: rust3ds/test-runner/run-tests@v1
         with:
           args: --doc --package ctru-rs
 
diff --git a/ctru-rs/Cargo.toml b/ctru-rs/Cargo.toml
index bdd7a4d..ac10586 100644
--- a/ctru-rs/Cargo.toml
+++ b/ctru-rs/Cargo.toml
@@ -34,8 +34,7 @@ cfg-if = "1.0.0"
 ferris-says = "0.2.1"
 futures = "0.3"
 lewton = "0.10.2"
-# TODO: switch to rust3ds org once migrated there. Also, rename?
-test-runner = { git = "https://github.com/ian-h-chamberlain/test-runner-3ds" }
+test-runner = { git = "https://github.com/rust3ds/test-runner.git" }
 time = "0.3.7"
 tokio = { version = "1.16", features = ["rt", "time", "sync", "macros"] }