diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c5ed61457..54c0ce472 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -86,11 +86,9 @@ jobs:
         sudo apt-get update
         sudo apt-get install g++-multilib
       if: matrix.build == 'linux32'
-    - run: cargo test ${{ matrix.no_run }}
-    - run: cargo test ${{ matrix.no_run }} --features parallel
-    - run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }}
-    - run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --features parallel
-    - run: cargo test ${{ matrix.no_run }} --manifest-path cc-test/Cargo.toml --target ${{ matrix.target }} --release
+    - run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }}
+    - run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }} --release
+    - run: cargo test ${{ matrix.no_run }} --workspace --target ${{ matrix.target }} --features parallel
 
   check-tvos:
     name: Test aarch64-apple-tvos
@@ -147,8 +145,8 @@ jobs:
       run: cargo +nightly update -Zminimal-versions
     - name: Cache downloaded crates since 1.53 is really slow in fetching
       uses: Swatinem/rust-cache@v2
-    - run: cargo check --lib
-    - run: cargo check --lib --all-features
+    - run: cargo check --lib -p cc
+    - run: cargo check --lib -p cc --all-features
 
   clippy:
     name: Clippy
diff --git a/Cargo.toml b/Cargo.toml
index 9e646aa64..720a76daa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,3 +28,9 @@ parallel = []
 
 [dev-dependencies]
 tempfile = "3"
+
+[workspace]
+members = [
+    "dev-tools/cc-test",
+    "dev-tools/gen-windows-sys-binding",
+]
diff --git a/cc-test/Cargo.toml b/dev-tools/cc-test/Cargo.toml
similarity index 91%
rename from cc-test/Cargo.toml
rename to dev-tools/cc-test/Cargo.toml
index 66f2d0144..cc7747eb6 100644
--- a/cc-test/Cargo.toml
+++ b/dev-tools/cc-test/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 test = false
 
 [build-dependencies]
-cc = { path = ".." }
+cc = { path = "../.." }
 which = "^4.0"
 
 [features]
diff --git a/cc-test/build.rs b/dev-tools/cc-test/build.rs
similarity index 100%
rename from cc-test/build.rs
rename to dev-tools/cc-test/build.rs
diff --git a/cc-test/src/NMakefile b/dev-tools/cc-test/src/NMakefile
similarity index 100%
rename from cc-test/src/NMakefile
rename to dev-tools/cc-test/src/NMakefile
diff --git a/cc-test/src/aarch64.S b/dev-tools/cc-test/src/aarch64.S
similarity index 100%
rename from cc-test/src/aarch64.S
rename to dev-tools/cc-test/src/aarch64.S
diff --git a/cc-test/src/aarch64.asm b/dev-tools/cc-test/src/aarch64.asm
similarity index 100%
rename from cc-test/src/aarch64.asm
rename to dev-tools/cc-test/src/aarch64.asm
diff --git a/cc-test/src/armv7.S b/dev-tools/cc-test/src/armv7.S
similarity index 100%
rename from cc-test/src/armv7.S
rename to dev-tools/cc-test/src/armv7.S
diff --git a/cc-test/src/bar1.c b/dev-tools/cc-test/src/bar1.c
similarity index 100%
rename from cc-test/src/bar1.c
rename to dev-tools/cc-test/src/bar1.c
diff --git a/cc-test/src/bar2.c b/dev-tools/cc-test/src/bar2.c
similarity index 100%
rename from cc-test/src/bar2.c
rename to dev-tools/cc-test/src/bar2.c
diff --git a/cc-test/src/baz.cpp b/dev-tools/cc-test/src/baz.cpp
similarity index 100%
rename from cc-test/src/baz.cpp
rename to dev-tools/cc-test/src/baz.cpp
diff --git a/cc-test/src/compile_error.c b/dev-tools/cc-test/src/compile_error.c
similarity index 100%
rename from cc-test/src/compile_error.c
rename to dev-tools/cc-test/src/compile_error.c
diff --git a/cc-test/src/cuda.cu b/dev-tools/cc-test/src/cuda.cu
similarity index 100%
rename from cc-test/src/cuda.cu
rename to dev-tools/cc-test/src/cuda.cu
diff --git a/cc-test/src/dummy.c b/dev-tools/cc-test/src/dummy.c
similarity index 100%
rename from cc-test/src/dummy.c
rename to dev-tools/cc-test/src/dummy.c
diff --git a/cc-test/src/expand.c b/dev-tools/cc-test/src/expand.c
similarity index 100%
rename from cc-test/src/expand.c
rename to dev-tools/cc-test/src/expand.c
diff --git a/cc-test/src/foo.c b/dev-tools/cc-test/src/foo.c
similarity index 100%
rename from cc-test/src/foo.c
rename to dev-tools/cc-test/src/foo.c
diff --git a/cc-test/src/i686.S b/dev-tools/cc-test/src/i686.S
similarity index 100%
rename from cc-test/src/i686.S
rename to dev-tools/cc-test/src/i686.S
diff --git a/cc-test/src/i686.asm b/dev-tools/cc-test/src/i686.asm
similarity index 100%
rename from cc-test/src/i686.asm
rename to dev-tools/cc-test/src/i686.asm
diff --git a/cc-test/src/include/foo.h b/dev-tools/cc-test/src/include/foo.h
similarity index 100%
rename from cc-test/src/include/foo.h
rename to dev-tools/cc-test/src/include/foo.h
diff --git a/cc-test/src/lib.rs b/dev-tools/cc-test/src/lib.rs
similarity index 100%
rename from cc-test/src/lib.rs
rename to dev-tools/cc-test/src/lib.rs
diff --git a/cc-test/src/msvc.c b/dev-tools/cc-test/src/msvc.c
similarity index 100%
rename from cc-test/src/msvc.c
rename to dev-tools/cc-test/src/msvc.c
diff --git a/cc-test/src/opt_linkage.c b/dev-tools/cc-test/src/opt_linkage.c
similarity index 100%
rename from cc-test/src/opt_linkage.c
rename to dev-tools/cc-test/src/opt_linkage.c
diff --git a/cc-test/src/riscv64gc.S b/dev-tools/cc-test/src/riscv64gc.S
similarity index 100%
rename from cc-test/src/riscv64gc.S
rename to dev-tools/cc-test/src/riscv64gc.S
diff --git a/cc-test/src/windows.c b/dev-tools/cc-test/src/windows.c
similarity index 100%
rename from cc-test/src/windows.c
rename to dev-tools/cc-test/src/windows.c
diff --git a/cc-test/src/x86_64.S b/dev-tools/cc-test/src/x86_64.S
similarity index 100%
rename from cc-test/src/x86_64.S
rename to dev-tools/cc-test/src/x86_64.S
diff --git a/cc-test/src/x86_64.asm b/dev-tools/cc-test/src/x86_64.asm
similarity index 100%
rename from cc-test/src/x86_64.asm
rename to dev-tools/cc-test/src/x86_64.asm
diff --git a/cc-test/tests/all.rs b/dev-tools/cc-test/tests/all.rs
similarity index 100%
rename from cc-test/tests/all.rs
rename to dev-tools/cc-test/tests/all.rs
diff --git a/cc-test/tests/output.rs b/dev-tools/cc-test/tests/output.rs
similarity index 100%
rename from cc-test/tests/output.rs
rename to dev-tools/cc-test/tests/output.rs
diff --git a/gen-windows-sys-binding/Cargo.toml b/dev-tools/gen-windows-sys-binding/Cargo.toml
similarity index 63%
rename from gen-windows-sys-binding/Cargo.toml
rename to dev-tools/gen-windows-sys-binding/Cargo.toml
index 6a4787b6b..98307c2a9 100644
--- a/gen-windows-sys-binding/Cargo.toml
+++ b/dev-tools/gen-windows-sys-binding/Cargo.toml
@@ -6,7 +6,3 @@ publish = false
 
 [dependencies]
 windows-bindgen = "0.49"
-
-# Prevent this from interfering with workspaces
-[workspace]
-members = ["."]
diff --git a/gen-windows-sys-binding/src/main.rs b/dev-tools/gen-windows-sys-binding/src/main.rs
similarity index 100%
rename from gen-windows-sys-binding/src/main.rs
rename to dev-tools/gen-windows-sys-binding/src/main.rs
diff --git a/gen-windows-sys-binding/windows_sys.list b/dev-tools/gen-windows-sys-binding/windows_sys.list
similarity index 100%
rename from gen-windows-sys-binding/windows_sys.list
rename to dev-tools/gen-windows-sys-binding/windows_sys.list