diff --git a/gio/inotify/inotify-path.c b/gio/inotify/inotify-path.c
index f0528f443..e1129cd72 100644
--- a/gio/inotify/inotify-path.c
+++ b/gio/inotify/inotify-path.c
@@ -208,6 +208,7 @@ ip_watched_file_free (ip_watched_file_t *file)
   g_assert (file->subs == NULL);
   g_free (file->filename);
   g_free (file->path);
+  g_free (file);
 }
 
 static void
diff --git a/gio/tests/testfilemonitor.c b/gio/tests/testfilemonitor.c
index b7f4a380d..a52ade715 100644
--- a/gio/tests/testfilemonitor.c
+++ b/gio/tests/testfilemonitor.c
@@ -4,8 +4,6 @@
 #include <stdlib.h>
 #include <gio/gio.h>
 
-#include "glib/glib-private.h"
-
 /* These tests were written for the inotify implementation.
  * Other implementations may require slight adjustments in
  * the tests, e.g. the length of timeouts
@@ -957,11 +955,6 @@ static void
 test_file_hard_links (Fixture       *fixture,
                       gconstpointer  user_data)
 {
-#ifdef _GLIB_ADDRESS_SANITIZER
-  g_test_incomplete ("FIXME: Leaks an inotify data structure, see glib#2311");
-  (void) file_hard_links_output;
-  (void) file_hard_links_step;
-#else
   GError *error = NULL;
   TestData data;
 
@@ -1012,7 +1005,6 @@ test_file_hard_links (Fixture       *fixture,
   g_object_unref (data.monitor);
   g_object_unref (data.file);
   g_object_unref (data.output_stream);
-#endif
 }
 
 int