diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f47fe5d..b46f2f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,11 +16,8 @@ jobs:
           sudo apt-get -yqq install git lsb-release sudo vim gnupg openjdk-17-jdk verilator gcc-riscv64-unknown-elf curl make gcc g++
       - name: Install sbt
         run: |
-          echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
-          echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list
-          curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add
-          sudo apt-get update
-          sudo apt-get -yqq install sbt
+          curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup --yes
+          export PATH="$PATH:~/.local/share/coursier/bin"
       - name: Run Scalafmt
         run: sbt scalafmtCheck
       - name: Static pipeline riscv-tests
diff --git a/tests/Makefile b/tests/Makefile
index 67a0f8e..6d86b01 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -25,7 +25,7 @@ endif
 
 TEST_DIRS ?= $(ISA_TESTS_DIR)/rv32ui $(ISA_TESTS_DIR)/rv32mi $(ISA_TESTS_DIR)/rv32um $(CUSTOM_TESTS_DIR)
 ALL_ISA_TESTS = $(shell find $(TEST_DIRS) -name '*.S')
-UNSUPPORTED_TESTS = %fence_i.S %breakpoint.S
+UNSUPPORTED_TESTS = %fence_i.S %breakpoint.S %ma_data.S %zicntr.S
 ALL_TESTS = $(filter-out $(UNSUPPORTED_TESTS),$(ALL_ISA_TESTS))
 ALL_TARGETS = $(addsuffix .pass,$(basename $(addprefix $(BUILD_DIR)/,$(notdir $(ALL_TESTS)))))
 
diff --git a/tests/riscv-test-env b/tests/riscv-test-env
deleted file mode 160000
index d3e85ae..0000000
--- a/tests/riscv-test-env
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d3e85ae435d1cdb782155530e9de83d6f14b6ae0
diff --git a/tests/riscv-tests b/tests/riscv-tests
index b7a0a80..51de008 160000
--- a/tests/riscv-tests
+++ b/tests/riscv-tests
@@ -1 +1 @@
-Subproject commit b7a0a80210c77c1d817243963ce35fba3ec97851
+Subproject commit 51de00886cd28a3cf9b85ee306fb2b5ee5ab550e
diff --git a/tests/riscv_test.h b/tests/riscv_test.h
index c4624c4..4e9e51a 100644
--- a/tests/riscv_test.h
+++ b/tests/riscv_test.h
@@ -1,7 +1,7 @@
 #ifndef RISCV_TEST_H
 #define RISCV_TEST_H
 
-#include "riscv-test-env/encoding.h"
+#include "riscv-tests/env/encoding.h"
 
 #define RVTEST_RV64U                                                    \
     .macro init;                                                        \