diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39c8aadd99..4b04ecdbcb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build windows-i386
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug
+        ./waf.bat configure -T debug --32bits
         ./waf.bat build
 
   build-windows-amd64:
@@ -49,7 +49,7 @@ jobs:
     - name: Build windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug -8
+        ./waf.bat configure -T debug
         ./waf.bat build
 
   build-dedicated-windows-i386:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d8adc5ab08..407239c4b9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Run tests windows-i386
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T release --tests --prefix=out/
+        ./waf.bat configure -T release --tests --prefix=out/ --32bits
         ./waf.bat install
         cd out
         $env:Path = "bin";
@@ -52,7 +52,7 @@ jobs:
     - name: Run tests windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T release --tests --prefix=out/ -8
+        ./waf.bat configure -T release --tests --prefix=out/
         ./waf.bat install
         cd out
         $env:Path = "bin";
diff --git a/scripts/build-macos-amd64.sh b/scripts/build-macos-amd64.sh
index de0e8cfd1c..91f46f4fdd 100755
--- a/scripts/build-macos-amd64.sh
+++ b/scripts/build-macos-amd64.sh
@@ -4,5 +4,5 @@ git submodule init && git submodule update
 
 brew install sdl2
 
-./waf configure -T debug --64bits --disable-warns $* &&
+./waf configure -T debug --disable-warns $* &&
 ./waf build
diff --git a/scripts/build-ubuntu-amd64.sh b/scripts/build-ubuntu-amd64.sh
index e598240dc7..97f0f413ce 100755
--- a/scripts/build-ubuntu-amd64.sh
+++ b/scripts/build-ubuntu-amd64.sh
@@ -4,5 +4,5 @@ git submodule init && git submodule update
 sudo apt-get update
 sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev
 
-./waf configure -T debug --64bits --disable-warns $* &&
+./waf configure -T debug --disable-warns $* &&
 ./waf build
diff --git a/scripts/build-ubuntu-i386.sh b/scripts/build-ubuntu-i386.sh
index c9609cae7e..a97851eac0 100755
--- a/scripts/build-ubuntu-i386.sh
+++ b/scripts/build-ubuntu-i386.sh
@@ -6,5 +6,5 @@ sudo apt-get update
 sudo apt-get install -y aptitude
 sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386
 
-PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns $* &&
+PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns --32bits $* &&
 ./waf build
diff --git a/scripts/tests-macos-amd64.sh b/scripts/tests-macos-amd64.sh
index ff4e46b278..2befa2d263 100755
--- a/scripts/tests-macos-amd64.sh
+++ b/scripts/tests-macos-amd64.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 git submodule init && git submodule update
-./waf configure -T release --sanitize=address,undefined --disable-warns --tests -8 --prefix=out/ $* &&
+./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 DYLD_LIBRARY_PATH=bin/ ./unittest || exit 1
diff --git a/scripts/tests-ubuntu-amd64.sh b/scripts/tests-ubuntu-amd64.sh
index 1cef058e97..1a4d47f2d4 100755
--- a/scripts/tests-ubuntu-amd64.sh
+++ b/scripts/tests-ubuntu-amd64.sh
@@ -4,7 +4,7 @@ git submodule init && git submodule update
 sudo apt-get update
 sudo apt-get install -y libbz2-dev
 
-./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ --64bits $* &&
+./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 LD_LIBRARY_PATH=bin/ ./unittest
diff --git a/scripts/tests-ubuntu-i386.sh b/scripts/tests-ubuntu-i386.sh
index f14fc3616b..c7a281445a 100755
--- a/scripts/tests-ubuntu-i386.sh
+++ b/scripts/tests-ubuntu-i386.sh
@@ -5,7 +5,7 @@ sudo dpkg --add-architecture i386
 sudo apt-get update
 sudo apt-get install -y g++-multilib gcc-multilib libbz2-dev:i386
 
-PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
+PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --32bits --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 LD_LIBRARY_PATH=bin/ ./unittest