diff --git a/.circleci/do-firesim-build.sh b/.circleci/do-firesim-build.sh
index 8114355f..709f3d0b 100755
--- a/.circleci/do-firesim-build.sh
+++ b/.circleci/do-firesim-build.sh
@@ -15,6 +15,13 @@ trap clean EXIT
 
 cd $LOCAL_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh
+cd $LOCAL_CHIPYARD_DIR/sims/firesim/sim/firesim-lib/src/main/cc/lib
+git submodule update --init elfutils libdwarf
+cd $LOCAL_CHIPYARD_DIR/sims/firesim
+./scripts/build-libelf.sh
+./scripts/build-libdwarf.sh
+cd $LOCAL_CHIPYARD_DIR
+
 
 # set stricthostkeychecking to no (must happen before rsync)
 run "echo \"Ping $SERVER\""
diff --git a/.circleci/run-firesim-tests.sh b/.circleci/run-firesim-tests.sh
index 6add6790..8cdf9e81 100755
--- a/.circleci/run-firesim-tests.sh
+++ b/.circleci/run-firesim-tests.sh
@@ -12,10 +12,19 @@ export FIRESIM_ENV_SOURCED=1
 
 SIMULATION_ARGS="${mapping[$1]}"
 
+cd $LOCAL_CHIPYARD_DIR/sims/firesim
+./scripts/build-libelf.sh
+./scripts/build-libdwarf.sh
+cd $LOCAL_CHIPYARD_DIR
+
+
 run_test_suite () {
+    export RISCV=$LOCAL_RISCV_DIR
+    export LD_LIBRARY_PATH=$LOCAL_RISCV_DIR/lib
     make -C $LOCAL_FIRESIM_DIR $SIMULATION_ARGS run-${1}-tests-fast
 }
 
+
 run_test_suite bmark
 run_test_suite nic
 run_test_suite blockdev