diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index 063f52ba..f72cf0ce 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #arch: ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
+        #arch: ["i686-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
         arch: ["x86_64-unknown-linux-gnu"]
         precision: [single]
         dimensions: [{"feature": "dim2", "short": "2d"}, {"feature": "dim3", "short": "3d"}]
diff --git a/.github/workflows/test_checks.yml b/.github/workflows/test_checks.yml
index 44e35a52..01eeef3a 100644
--- a/.github/workflows/test_checks.yml
+++ b/.github/workflows/test_checks.yml
@@ -15,10 +15,13 @@ jobs:
           version: 4.3.0
           use-dotnet: false
           include-templates: true
-      - name: Run Tests for 2D Build
+      - name: Run Unit Tests for 2D Build
         shell: sh
         run: |
           cargo test --all-targets --features="build2d,test" --no-default-features
+      - name: Run Integration Tests for 2D Build
+        shell: sh
+        run: |
           ./scripts/build-dev-2d.sh
           godot --headless --path ./bin2d test.tscn --quit-after 1000 > output.log 2>&1
           echo "---------------------"
@@ -45,10 +48,13 @@ jobs:
           version: 4.3.0
           use-dotnet: false
           include-templates: true
-      - name: Run Tests for 3D Build
+      - name: Run Unit Tests for 3D Build
         shell: sh
         run: |
           cargo test --all-targets --features="build3d,test" --no-default-features
+      - name: Run Integration Tests for 3D Build
+        shell: sh
+        run: |
           ./scripts/build-dev-3d.sh
           godot --headless --path ./bin3d test.tscn --quit-after 1000 > output.log 2>&1
           echo "---------------------"
diff --git a/scripts/build-dev-2d.sh b/scripts/build-dev-2d.sh
index a3fbbe88..d8b05af8 100755
--- a/scripts/build-dev-2d.sh
+++ b/scripts/build-dev-2d.sh
@@ -1,13 +1,12 @@
 cargo fmt -- --config-path rustfmt.toml
 cargo clippy --fix --allow-dirty
-cargo build --features="build2d,test" --no-default-features
 if [ "${OSTYPE#darwin}" != "$OSTYPE" ]; then
-    # macOS
+    cargo build --features="build2d,test" --no-default-features
     echo "Running on macOS"
     rm -f bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
     cp target/debug/libgodot_rapier.dylib bin2d/addons/godot-rapier2d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
 else
-    # Linux
+    cargo build --features="build2d,test" --no-default-features --target=x86_64-unknown-linux-gnu
     echo "Running on Linux"
-    cp target/debug/libgodot_rapier.so bin2d/addons/godot-rapier2d/bin/libgodot_rapier.linux.x86_64-unknown-linux-gnu.so
+    cp target/x86_64-unknown-linux-gnu/debug/libgodot_rapier.so bin2d/addons/godot-rapier2d/bin/libgodot_rapier.linux.x86_64-unknown-linux-gnu.so
 fi
diff --git a/scripts/build-dev-3d.sh b/scripts/build-dev-3d.sh
index 1848a17e..ba71ef91 100755
--- a/scripts/build-dev-3d.sh
+++ b/scripts/build-dev-3d.sh
@@ -1,13 +1,12 @@
 cargo fmt -- --config-path rustfmt.toml
 cargo clippy --fix --allow-dirty
-cargo build --features="build3d,test" --no-default-features
 if [ "${OSTYPE#darwin}" != "$OSTYPE" ]; then
-    # macOS
+    cargo build --features="build3d,test" --no-default-features
     echo "Running on macOS"
     rm -f bin3d/addons/godot-rapier3d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
     cp target/debug/libgodot_rapier.dylib bin3d/addons/godot-rapier3d/bin/libgodot_rapier.macos.framework/libgodot_rapier.macos.dylib
 else
-    # Linux
+    cargo build --features="build3d,test" --no-default-features --target=x86_64-unknown-linux-gnu
     echo "Running on Linux"
-    cp target/debug/libgodot_rapier.so bin3d/addons/godot-rapier3d/bin/libgodot_rapier.linux.x86_64-unknown-linux-gnu.so
+    cp target/x86_64-unknown-linux-gnu/debug/libgodot_rapier.so bin3d/addons/godot-rapier3d/bin/libgodot_rapier.linux.x86_64-unknown-linux-gnu.so
 fi