diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index a575eb35..b79b67f8 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -35,12 +35,15 @@ jobs:
     - name: Some packages compile for WebAssembly
       run: GOOS=js GOARCH=wasm go build . ./storage ./tracker/...
 
+
     - name: Install godo
-      run: go install github.com/anacrolix/godo@latest
+      # Need master for cross-compiling fix
+      run: go install github.com/anacrolix/godo@master
 
     - name: Apt packages
       run: sudo apt install pv fuse
 
     - name: torrentfs end-to-end test
-      run: fs/test.sh
+      # Test on 386 for atomic alignment and other bad 64-bit assumptions
+      run: GOARCH=386 fs/test.sh
       timeout-minutes: 10
diff --git a/fs/test.sh b/fs/test.sh
index 280cff65..ea5787aa 100755
--- a/fs/test.sh
+++ b/fs/test.sh
@@ -6,7 +6,7 @@ trap 'set +e; sudo umount -f mnt' EXIT
 debian_file=debian-10.8.0-amd64-netinst.iso
 pushd torrents
 cp "$repopath/testdata/$debian_file.torrent" .
-godo -v -race "$repopath/cmd/torrent" metainfo "$repopath/testdata/sintel.torrent" magnet > sintel.magnet
+godo -v "$repopath/cmd/torrent" metainfo "$repopath/testdata/sintel.torrent" magnet > sintel.magnet
 popd
 #file="$debian_file"
 file=Sintel/Sintel.mp4