diff --git a/tests/all-symbols-test.c b/tests/all-symbols-test.c
index a256ade0..d1bafbdd 100644
--- a/tests/all-symbols-test.c
+++ b/tests/all-symbols-test.c
@@ -50,7 +50,8 @@ static void test_logf(int level, const char *format, ...)
 		case LOG_DEBUG:
 			if (!_debug)
 				break;
-		case LOG_NORMAL: /* fall through */
+		/* fall through */
+		case LOG_NORMAL:
 			fprintf(stdout, "%s", target);
 			break;
 		case LOG_ERROR:
@@ -121,7 +122,6 @@ int main(int argc, char **argv)
 {
 	int i, r;
 	void *h;
-	const char *libfile = "libcryptsetup.so.12"; /* TODO import proper version */
 
 	for (i = 1; i < argc; i++) {
 		if (*argv[i] != '-')
diff --git a/tests/api-test-2.c b/tests/api-test-2.c
index 13b20fb2..7acb82f6 100644
--- a/tests/api-test-2.c
+++ b/tests/api-test-2.c
@@ -376,6 +376,9 @@ static int _setup(void)
 	char cmd[128];
 
 	test_loop_file = strdup(THE_LFILE_TEMPLATE);
+	if (!test_loop_file)
+		return 1;
+
 	if ((fd=mkstemp(test_loop_file)) == -1) {
 		printf("cannot create temporary file with template %s\n", test_loop_file);
 		return 1;
@@ -390,6 +393,9 @@ static int _setup(void)
 	close(fd);
 
 	tmp_file_1 = strdup(THE_LFILE_TEMPLATE);
+	if (!tmp_file_1)
+		return 1;
+
 	if ((fd=mkstemp(tmp_file_1)) == -1) {
 		printf("cannot create temporary file with template %s\n", tmp_file_1);
 		return 1;
diff --git a/tests/api-test.c b/tests/api-test.c
index 80ab6af6..258c24be 100644
--- a/tests/api-test.c
+++ b/tests/api-test.c
@@ -239,6 +239,9 @@ static int _setup(void)
 	char cmd[128];
 
 	test_loop_file = strdup(THE_LFILE_TEMPLATE);
+	if (!test_loop_file)
+		return 1;
+
 	if ((fd=mkstemp(test_loop_file)) == -1) {
 		printf("cannot create temporary file with template %s\n", test_loop_file);
 		return 1;
@@ -253,6 +256,9 @@ static int _setup(void)
 	close(fd);
 
 	tmp_file_1 = strdup(THE_LFILE_TEMPLATE);
+	if (!tmp_file_1)
+		return 1;
+
 	if ((fd=mkstemp(tmp_file_1)) == -1) {
 		printf("cannot create temporary file with template %s\n", tmp_file_1);
 		return 1;