diff --git a/.travis.yml b/.travis.yml
index 7aa53374..c5b12283 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,6 +103,6 @@ before_script:
 script:
   - cd user && make sfsimg arch=$ARCH && cd ..
   - cd kernel && make build arch=$ARCH $OPTS && cd ..
-  - if [ $ARCH = riscv64 ]; then
+  - if [ $ARCH = riscv32 ]; then
         cd tests && ./test.sh && cd ..;
     fi
diff --git a/tests/test.sh b/tests/test.sh
index 8ffc9d39..1f1a8ca6 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
+cd ../kernel && make sfsimg arch=riscv32 && cd ../tests
 for f in *.cmd
 do
     echo testing $f begin
     (
         cd ../kernel
-        exec timeout 10s make runtest arch=riscv64 init=$(cat ../tests/$f)
+        make build arch=riscv32 init=$(cat ../tests/$f)
+        exec timeout 10s make justruntest arch=riscv32 init=$(cat ../tests/$f)
     ) &
 
     pid=$!