diff --git a/subsys/testsuite/ztest/src/ztest.c b/subsys/testsuite/ztest/src/ztest.c
index 4215ec77c89..12271e61eb9 100644
--- a/subsys/testsuite/ztest/src/ztest.c
+++ b/subsys/testsuite/ztest/src/ztest.c
@@ -439,8 +439,11 @@ static void test_finalize(void)
 {
 	if (IS_ENABLED(CONFIG_MULTITHREADING)) {
 		k_thread_abort(&ztest_thread);
-		k_thread_abort(k_current_get());
+		if (k_is_in_isr()) {
+			return;
+		}
 
+		k_thread_abort(k_current_get());
 		CODE_UNREACHABLE;
 	}
 }
diff --git a/subsys/testsuite/ztest/src/ztest_new.c b/subsys/testsuite/ztest/src/ztest_new.c
index 4215ec77c89..12271e61eb9 100644
--- a/subsys/testsuite/ztest/src/ztest_new.c
+++ b/subsys/testsuite/ztest/src/ztest_new.c
@@ -439,8 +439,11 @@ static void test_finalize(void)
 {
 	if (IS_ENABLED(CONFIG_MULTITHREADING)) {
 		k_thread_abort(&ztest_thread);
-		k_thread_abort(k_current_get());
+		if (k_is_in_isr()) {
+			return;
+		}
 
+		k_thread_abort(k_current_get());
 		CODE_UNREACHABLE;
 	}
 }