diff --git a/tests/api-test-2.c b/tests/api-test-2.c
index 07361b60..1daafda5 100644
--- a/tests/api-test-2.c
+++ b/tests/api-test-2.c
@@ -259,8 +259,10 @@ static void _cleanup(void)
 	_system("rm -f " IMAGE1, 0);
 	_system("rm -rf " CONV_DIR, 0);
 
-	remove(test_loop_file);
-	remove(tmp_file_1);
+	if (test_loop_file)
+		remove(test_loop_file);
+	if (tmp_file_1)
+		remove(tmp_file_1);
 
 	remove(VALID_LUKS2_HEADER);
 	remove(REQS_LUKS2_HEADER);
diff --git a/tests/api-test.c b/tests/api-test.c
index e3b30e05..42aca6f6 100644
--- a/tests/api-test.c
+++ b/tests/api-test.c
@@ -199,8 +199,10 @@ static void _cleanup(void)
 	_system("rm -f " IMAGE_EMPTY, 0);
 	_system("rm -f " IMAGE1, 0);
 
-	remove(test_loop_file);
-	remove(tmp_file_1);
+	if (test_loop_file)
+		remove(test_loop_file);
+	if (tmp_file_1)
+		remove(tmp_file_1);
 
 	remove(EVL_HEADER_1);
 	remove(EVL_HEADER_2);
diff --git a/tests/test_utils.c b/tests/test_utils.c
index 07ff0e00..f8f6f9d4 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -301,10 +301,13 @@ static int t_dm_satisfies_version(unsigned target_maj, unsigned target_min,
 static void t_dm_set_crypt_compat(const char *dm_version, unsigned crypt_maj,
 				 unsigned crypt_min, unsigned crypt_patch)
 {
-	unsigned dm_maj, dm_min, dm_patch;
+	unsigned dm_maj = 0, dm_min = 0, dm_patch = 0;
 
-	if (sscanf(dm_version, "%u.%u.%u", &dm_maj, &dm_min, &dm_patch) != 3)
-		dm_maj = dm_min = dm_patch = 0;
+	if (sscanf(dm_version, "%u.%u.%u", &dm_maj, &dm_min, &dm_patch) != 3) {
+		dm_maj = 0;
+		dm_min = 0;
+		dm_patch = 0;
+	}
 
 	if (t_dm_satisfies_version(1, 2, crypt_maj, crypt_min))
 		t_dm_crypt_flags |= T_DM_KEY_WIPE_SUPPORTED;
@@ -372,6 +375,9 @@ int t_dm_check_versions(void)
 	if (!dm_task_run(dmt))
 		goto out;
 
+	if (!dm_task_get_driver_version(dmt, dm_version, sizeof(dm_version)))
+		goto out;
+
 	target = dm_task_get_versions(dmt);
 	do {
 		last_target = target;