diff --git a/test/litest.c b/test/litest.c
index 6b44d45f..438a3714 100644
--- a/test/litest.c
+++ b/test/litest.c
@@ -1440,11 +1440,11 @@ litest_create(enum litest_device_type which,
 				break;
 			}
 		}
-
-		free(abs);
-		free(events);
 	}
 
+	free(abs);
+	free(events);
+
 	path = libevdev_uinput_get_devnode(d->uinput);
 	litest_assert(path != NULL);
 	fd = open(path, O_RDWR|O_NONBLOCK);
diff --git a/tools/libinput-record.c b/tools/libinput-record.c
index e1eacdd3..757892a5 100644
--- a/tools/libinput-record.c
+++ b/tools/libinput-record.c
@@ -1841,7 +1841,7 @@ select_device(void)
 	int ndev, selected_device;
 	int rc;
 	char *device_path;
-	bool has_eaccess;
+	bool has_eaccess = false;
 	int available_devices = 0;
 
 	ndev = scandir("/dev/input", &namelist, is_event_node, versionsort);