diff --git a/expect-lava/crash_passed_test.exp b/expect-lava/crash_passed_test.exp
new file mode 100644
index 0000000..fd7f0dc
--- /dev/null
+++ b/expect-lava/crash_passed_test.exp
@@ -0,0 +1,9 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for AP/RSS non-volatile counter platform test
+#
+
+expect_string+=('i;Passed nv_counter_test')
diff --git a/expect/crash_passed_test.exp b/expect/crash_passed_test.exp
new file mode 100644
index 0000000..b0e347c
--- /dev/null
+++ b/expect/crash_passed_test.exp
@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+# Expect script for AP/RSS non-volatile counter platform test
+#
+
+source [file join [file dirname [info script]] handle-arguments.inc]
+
+# Trusted Firmware boot section
+source [file join [file dirname [info script]] trusted-firmware.inc]
+
+expect_string "Passed nv_counter_test"
diff --git a/group/tf-plat-tests/fvp-tc2-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc2-debug b/group/tf-plat-tests/fvp-tc2-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc2-debug
new file mode 100644
index 0000000..b8939c8
--- /dev/null
+++ b/group/tf-plat-tests/fvp-tc2-nv-ctrs:fvp-linux.tc-fip.tc-tc.crash-tc2-debug
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2022, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/run_config/fvp-tc.crash b/run_config/fvp-tc.crash
new file mode 100644
index 0000000..e7317fd
--- /dev/null
+++ b/run_config/fvp-tc.crash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2023, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+generate_lava_job() {
+	uart="1" timeout="60" port="5003" file="crash_passed_test.exp" set_primary="1" \
+		track_expect
+}
diff --git a/tf_config/fvp-tc2-plat-test-nv-ctrs b/tf_config/fvp-tc2-nv-ctrs
similarity index 100%
rename from tf_config/fvp-tc2-plat-test-nv-ctrs
rename to tf_config/fvp-tc2-nv-ctrs