diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index ade46f481..561e58fa1 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -46,7 +46,7 @@ jobs:
       set -e
       pushd ci
       ./ci_check_tvla_aes.sh
-      ../cw/tvla.py --cfg-file cfg/ci_tvla_cfg_aes_specific_byte0_rnd0.yaml run-tvla
+      ../cw/tvla.py --cfg-file cfg/ci_tvla_cfg_aes_specific_byte0_rnd0.yaml run-tvla 
       popd
     displayName: "Check AES TVLA"
   - publish: ./ci/tmp/figures
diff --git a/ci/ci_check_aes_traces.sh b/ci/ci_check_aes_traces.sh
index aa48b1536..06dc448d7 100755
--- a/ci/ci_check_aes_traces.sh
+++ b/ci/ci_check_aes_traces.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Simple script to test AES capture.
+set -e
 mkdir -p tmp
 
 # AES
@@ -19,7 +20,16 @@ for test in ${!aes_test_list[@]}; do
   NUM_TRACES=${aes_test_list[${test}]}
   ../cw/capture.py --cfg-file cfg/ci_capture_aes_cw310.yaml capture ${test} \
       --num-traces ${NUM_TRACES} ${ARGS}
-
+  rc=$?
+  if [ $retVal -ne 0 ]; then
+    exit $retVal
+  fi
+  ./ci_trace_check/ci_compare_aes_traces.py -f ./ci_projects/opentitan_simple_aes.cwp \
+      -g ./ci_trace_check/golden_traces/aes_128_ecb_static.zip -c 0.8
+  rc=$?
+  if [ $retVal -ne 0 ]; then
+    exit $retVal
+  fi
   mv ./ci_projects/sample_traces_${MODE}.html tmp/${test}_traces.html
   ARGS=""
 done
diff --git a/ci/ci_check_tvla_aes.sh b/ci/ci_check_tvla_aes.sh
index d56f57540..eff63bc1a 100755
--- a/ci/ci_check_tvla_aes.sh
+++ b/ci/ci_check_tvla_aes.sh
@@ -5,6 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Simple script to test AES capture.
+set -e
 mkdir -p tmp
 
 # AES
diff --git a/python-requirements.txt b/python-requirements.txt
index f3e4e7d73..f9a1400d8 100644
--- a/python-requirements.txt
+++ b/python-requirements.txt
@@ -27,7 +27,7 @@ joblib
 # Development version of ChipWhisperer toolchain with latest features and
 # bug fixes - Needs to be installed in editable mode. We fix the version
 # for improved stability and manually update if necessary.
--e git+https://github.com/newaetech/chipwhisperer.git@3eace1719daf43d4f0965c1790c2c8a9e8b2f690#egg=chipwhisperer
+-e git+https://github.com/newaetech/chipwhisperer.git@c5181a87111d3aabab42d83b10dbc368140b43ef#egg=chipwhisperer
 
 # Linters
 -r python-requirements-lint.txt