diff --git a/.travis/build-aarch64-linux/build.sh b/.travis/build-aarch64-linux/build.sh
index c348d96a..396e806b 100755
--- a/.travis/build-aarch64-linux/build.sh
+++ b/.travis/build-aarch64-linux/build.sh
@@ -7,5 +7,7 @@ export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
 
 cd dynarmic
 mkdir build && cd build
-cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -DDYNARMIC_TESTS=false -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-8 -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-8
-make -j4
+cmake .. -DBoost_INCLUDE_DIRS=${PWD}/../externals/ext-boost -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc-8 -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++-8 -G Ninja
+ninja
+
+qemu-aarch64 -L /usr/aarch64-linux-gnu ./tests/dynarmic_tests -d yes
diff --git a/.travis/build-aarch64-linux/deps.sh b/.travis/build-aarch64-linux/deps.sh
index 17227c98..9af4af81 100755
--- a/.travis/build-aarch64-linux/deps.sh
+++ b/.travis/build-aarch64-linux/deps.sh
@@ -4,7 +4,7 @@ set -e
 set -x
 
 apt-get update
-apt-get install -y git cmake gcc make g++-8-aarch64-linux-gnu
+apt-get install -y git cmake gcc ninja-build g++-8-aarch64-linux-gnu qemu-user
 
 # TODO: This isn't ideal.
 cd dynarmic/externals
diff --git a/tests/A32/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp
index c8990618..b769623e 100644
--- a/tests/A32/fuzz_arm.cpp
+++ b/tests/A32/fuzz_arm.cpp
@@ -76,9 +76,14 @@ u32 GenRandomInst(u32 pc, bool is_last_inst) {
     } instructions = []{
         const std::vector<std::tuple<std::string, const char*>> list {
 #define INST(fn, name, bitstring) {#fn, bitstring},
+#ifdef ARCHITECTURE_Aarch64
+#include "frontend/A32/decoder/arm_a64.inc"
+#include "frontend/A32/decoder/vfp2_a64.inc"
+#else
 #include "frontend/A32/decoder/arm.inc"
 #include "frontend/A32/decoder/asimd.inc"
 #include "frontend/A32/decoder/vfp.inc"
+#endif
 #undef INST
         };