diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c
index 6d6bae41d..e21c33864 100644
--- a/test/bdev/bdevperf/bdevperf.c
+++ b/test/bdev/bdevperf/bdevperf.c
@@ -470,6 +470,7 @@ end_run(void *arg1, void *arg2)
 		if (g_request && !g_shutdown) {
 			rpc_perform_tests_cb(rc);
 		} else {
+			bdevperf_free_targets();
 			spdk_app_stop(rc);
 		}
 	}
@@ -1316,6 +1317,7 @@ bdevperf_run(void *arg1)
 
 	rc = bdevperf_test();
 	if (rc) {
+		bdevperf_free_targets();
 		spdk_app_stop(1);
 		return;
 	}
@@ -1342,6 +1344,7 @@ spdk_bdevperf_shutdown_cb(void)
 	g_shutdown = true;
 
 	if (g_target_count == 0) {
+		bdevperf_free_targets();
 		spdk_app_stop(0);
 		return;
 	}
@@ -1497,7 +1500,6 @@ main(int argc, char **argv)
 		g_run_failed = true;
 	}
 
-	bdevperf_free_targets();
 	spdk_app_fini();
 	return g_run_failed;
 }