diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index 10fd58fb..ab3cf5cc 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -69,7 +69,7 @@ case $1 in
         export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
         export PATH=$RISCV/bin:$PATH
         (cd $LOCAL_CHIPYARD_DIR/generators/sha3/software && ./build.sh)
-        $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/benchmarks/bare/sha3-rocc.riscv
+        $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/tests/bare/sha3-rocc.riscv
         ;;
     chipyard-streaming-passthrough)
         make -C $LOCAL_CHIPYARD_DIR/tests
diff --git a/generators/sha3 b/generators/sha3
index 21035e49..63eda826 160000
--- a/generators/sha3
+++ b/generators/sha3
@@ -1 +1 @@
-Subproject commit 21035e498573b0e541cb87fe330e9d8dcfc88238
+Subproject commit 63eda8268c16c502cada9944ae41b584e6e32789
diff --git a/software/firemarshal b/software/firemarshal
index 22f9101d..daf1040c 160000
--- a/software/firemarshal
+++ b/software/firemarshal
@@ -1 +1 @@
-Subproject commit 22f9101d456f36d9580bd3327a1613e39812d06d
+Subproject commit daf1040c0f0ec449734cd183be876880357644fc