diff --git a/src/etnaviv/ci/etnaviv-vipnano-si-plus-fails.txt b/src/etnaviv/ci/etnaviv-vipnano-si-plus-fails.txt
index 14e778f8efe..6a9d7c5c8cb 100644
--- a/src/etnaviv/ci/etnaviv-vipnano-si-plus-fails.txt
+++ b/src/etnaviv/ci/etnaviv-vipnano-si-plus-fails.txt
@@ -1,16 +1,49 @@
-Conv2D.Op/input_size_112_weight_size_5_input_channels_256_output_channels_120_stride_1_padding_same_0_is_signed_0,Fail
-Conv2D.Op/input_size_112_weight_size_5_input_channels_256_output_channels_120_stride_1_padding_same_1_is_signed_0,Fail
-
-Add.Op/input_size_112_weight_size_3_input_channels_32_output_channels_120_stride_1_padding_same_1_is_signed_0,Fail
-Add.Op/input_size_112_weight_size_5_input_channels_32_output_channels_256_stride_1_padding_same_1_is_signed_0,Fail
-Add.Op/input_size_5_weight_size_5_input_channels_32_output_channels_256_stride_1_padding_same_1_is_signed_0,Fail
-Add.Op/input_size_5_weight_size_5_input_channels_32_output_channels_256_stride_2_padding_same_1_is_signed_0,Fail
-Add.Op/input_size_80_weight_size_3_input_channels_32_output_channels_120_stride_1_padding_same_1_is_signed_0,Fail
-Add.Op/input_size_80_weight_size_5_input_channels_32_output_channels_256_stride_1_padding_same_1_is_signed_0,Fail
-
 # Something seems to have changed in TensorFlow Lite and it doesn't pass any more.
 # Probably the implementation of TFLite_Detection_PostProcess is producing results in a different order.
 # The model actually detects correctly.
 Models.Op/mobiledet_ssdlite_mobiledet_coco_qat_postprocess,Fail
 
-Models.Op/yolox_yolox,Fail
+Models.Op/yolox_104,Fail
+Models.Op/yolox_114,Fail
+Models.Op/yolox_124,Fail
+Models.Op/yolox_127,Fail
+Models.Op/yolox_130,Fail
+Models.Op/yolox_133,Fail
+Models.Op/yolox_yolox_nano_full_integer_quant,Fail
+
+Models.Op/efficientdet_efficientdet_tflite_lite0_int8_v1,Fail
+
+Models.Op/inception_000,Fail
+Models.Op/inception_inception_v1_224_quant,Fail
+
+Models.Op/movenetlightning_093,Fail
+Models.Op/movenetlightning_095,Fail
+Models.Op/movenetlightning_098,Fail
+Models.Op/movenetlightning_112,Fail
+Models.Op/movenetlightning_115,Fail
+Models.Op/movenetlightning_118,Fail
+Models.Op/movenetlightning_134,Fail
+Models.Op/movenetlightning_136,Fail
+Models.Op/movenetlightning_139,Fail
+Models.Op/movenetlightning_141,Fail
+Models.Op/movenetlightning_152,Fail
+Models.Op/movenetlightning_155,Fail
+Models.Op/movenetlightning_movenet_single_pose_lightning_ptq,Fail
+
+Models.Op/movenetthunder_093,Fail
+Models.Op/movenetthunder_095,Fail
+Models.Op/movenetthunder_098,Fail
+Models.Op/movenetthunder_112,Fail
+Models.Op/movenetthunder_115,Fail
+Models.Op/movenetthunder_118,Fail
+Models.Op/movenetthunder_134,Fail
+Models.Op/movenetthunder_136,Fail
+Models.Op/movenetthunder_139,Fail
+Models.Op/movenetthunder_141,Fail
+Models.Op/movenetthunder_152,Fail
+Models.Op/movenetthunder_155,Fail
+Models.Op/movenetthunder_movenet_single_pose_thunder_ptq,Fail
+
+Models.Op/ssdmobilenetv2_011,Fail
+Models.Op/ssdmobilenetv2_052,Fail
+Models.Op/ssdmobilenetv2_ssd_mobilenet_v2_coco_quant_postprocess,Fail
diff --git a/src/etnaviv/ci/etnaviv-vipnano-si-plus-skips.txt b/src/etnaviv/ci/etnaviv-vipnano-si-plus-skips.txt
index 629d372b3b1..dbeb53e26e8 100644
--- a/src/etnaviv/ci/etnaviv-vipnano-si-plus-skips.txt
+++ b/src/etnaviv/ci/etnaviv-vipnano-si-plus-skips.txt
@@ -1,3 +1,14 @@
-# The blob produces the same result as Mesa, but different from XNNPACK
-Add.Op/input_size_8_weight_size_3_input_channels_32_output_channels_120_stride_1_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_32_output_channels_256_stride_1_padding_same_1_is_signed_0
+Add.Op/.*
+AddQuant.Op/.*
+Conv2D.Op/.*
+DepthwiseConv2D.Op/.*
+FullyConnected.Op/.*
+
+# GatherNd operations that are unsupported.
+# If they fail is because of a bug in the teflon test runner.
+Models.Op/movenetlightning_112
+Models.Op/movenetlightning_141
+Models.Op/movenetlightning_152
+Models.Op/movenetthunder_112
+Models.Op/movenetthunder_141
+Models.Op/movenetthunder_152
diff --git a/src/etnaviv/ci/etnaviv-vipnano-skips.txt b/src/etnaviv/ci/etnaviv-vipnano-skips.txt
index 8f6df5aaf44..5ce266148ef 100644
--- a/src/etnaviv/ci/etnaviv-vipnano-skips.txt
+++ b/src/etnaviv/ci/etnaviv-vipnano-skips.txt
@@ -1,19 +1,23 @@
-# The blob produces the same result as Mesa, but different from XNNPACK
-Add.Op/input_size_8_weight_size_3_input_channels_32_output_channels_120_stride_1_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_32_output_channels_256_stride_1_padding_same_1_is_signed_0
+Add.Op/.*
+AddQuant.Op/.*
+Conv2D.Op/.*
+DepthwiseConv2D.Op/.*
+FullyConnected.Op/.*
 
-Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_1_stride_2_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_32_stride_2_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_120_stride_2_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_128_stride_2_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_160_stride_2_padding_same_1_is_signed_0
-Add.Op/input_size_8_weight_size_5_input_channels_1_output_channels_256_stride_2_padding_same_1_is_signed_0
+# GatherNd operations that are unsupported.
+# If they fail is because of a bug in the teflon test runner.
+Models.Op/movenetlightning_112
+Models.Op/movenetlightning_141
+Models.Op/movenetlightning_152
+Models.Op/movenetthunder_112
+Models.Op/movenetthunder_141
+Models.Op/movenetthunder_152
 
 # No idea why this one is failing, needs investigation.
 # It takes a long time, so better skip for now.
 Models.Op/mobiledet_ssdlite_mobiledet_coco_qat_postprocess
 
-# These tests below (adds) aren't well constructed and thus fail in TF
+# These tests below are additions that Rocket only supports when they can be fused to a convolution.
 Models.Op/mobiledet_008
 Models.Op/mobiledet_011
 Models.Op/mobiledet_014
@@ -36,5 +40,3 @@ Models.Op/yolox_026
 Models.Op/yolox_035
 Models.Op/yolox_038
 Models.Op/yolox_041
-
-FullyConnected.Op/*
\ No newline at end of file