diff --git a/android/tester-a2dp.c b/android/tester-a2dp.c
index eb88244..f7d82c9 100644
--- a/android/tester-a2dp.c
+++ b/android/tester-a2dp.c
@@ -236,10 +236,14 @@ struct queue *get_a2dp_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-avrcp.c b/android/tester-avrcp.c
index 24953a2..cec9787 100644
--- a/android/tester-avrcp.c
+++ b/android/tester-avrcp.c
@@ -584,10 +584,14 @@ struct queue *get_avrcp_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-bluetooth.c b/android/tester-bluetooth.c
index c61b87c..1381f63 100644
--- a/android/tester-bluetooth.c
+++ b/android/tester-bluetooth.c
@@ -1224,10 +1224,14 @@ struct queue *get_bluetooth_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-gatt.c b/android/tester-gatt.c
index 9ba2049..f6b0492 100644
--- a/android/tester-gatt.c
+++ b/android/tester-gatt.c
@@ -3394,10 +3394,14 @@ struct queue *get_gatt_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-hdp.c b/android/tester-hdp.c
index 7397de4..80f3b5f 100644
--- a/android/tester-hdp.c
+++ b/android/tester-hdp.c
@@ -549,10 +549,14 @@ struct queue *get_hdp_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-hidhost.c b/android/tester-hidhost.c
index b3880b3..ab5f12b 100644
--- a/android/tester-hidhost.c
+++ b/android/tester-hidhost.c
@@ -719,10 +719,14 @@ struct queue *get_hidhost_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-pan.c b/android/tester-pan.c
index 4feb6cf..e033e21 100644
--- a/android/tester-pan.c
+++ b/android/tester-pan.c
@@ -226,10 +226,14 @@ struct queue *get_pan_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }
diff --git a/android/tester-socket.c b/android/tester-socket.c
index 3b1dd54..41e1434 100644
--- a/android/tester-socket.c
+++ b/android/tester-socket.c
@@ -447,10 +447,14 @@ struct queue *get_socket_tests(void)
 	uint16_t i = 0;
 
 	list = queue_new();
+	if (!list)
+		return NULL;
 
 	for (; i < sizeof(test_cases) / sizeof(test_cases[0]); ++i)
-		if (!queue_push_tail(list, &test_cases[i]))
+		if (!queue_push_tail(list, &test_cases[i])) {
+			queue_destroy(list, NULL);
 			return NULL;
+		}
 
 	return list;
 }