diff --git a/Makefile.am b/Makefile.am
index b919a3f7..331e2337 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = daemon data help lib po src tools tests
 
 EXTRA_DIST = AUTHORS tap-test COPYING.gpl-2
 
-DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir='$(prefix)/etc/systemd/system'
+DISTCHECK_CONFIGURE_FLAGS = --with-sysprofd=bundled --with-systemdsystemunitdir='$(prefix)/etc/systemd/system'
 
 AUTHORS:
 	$(AM_V_GEN)if test -d "$(srcdir)/.git"; \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 24191540..34554ee6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -180,9 +180,9 @@ libsysprof_ui_@API_VERSION@_la_SOURCES = \
 	sp-visualizer-list.c \
 	sp-visualizer-list.h \
 	sp-visualizer-row.c \
+	sp-visualizer-row-private.h \
 	sp-visualizer-ticks.c \
 	sp-visualizer-ticks.h \
-	sp-visualizer-ticks-private.h \
 	sp-visualizer-view.c \
 	sp-zoom-manager.c \
 	$(NULL)
diff --git a/tests/test-capture-cursor.c b/tests/test-capture-cursor.c
index 14e0e76f..66bcefc0 100644
--- a/tests/test-capture-cursor.c
+++ b/tests/test-capture-cursor.c
@@ -22,10 +22,12 @@ test_cursor_basic (void)
   gint r;
   gint count = 0;
 
-  writer = sp_capture_writer_new ("capture-file", 0);
+  writer = sp_capture_writer_new ("capture-cursor-file", 0);
   g_assert (writer != NULL);
 
-  reader = sp_capture_reader_new ("capture-file", &error);
+  sp_capture_writer_flush (writer);
+
+  reader = sp_capture_reader_new ("capture-cursor-file", &error);
   g_assert_no_error (error);
   g_assert (reader != NULL);
 
@@ -45,13 +47,14 @@ test_cursor_basic (void)
   sp_capture_reader_unref (reader);
   sp_capture_writer_unref (writer);
 
-  g_unlink ("capture-file");
+  g_unlink ("capture-cursor-file");
 }
 
 int
 main (int argc,
       char *argv[])
 {
+  sp_clock_init ();
   g_test_init (&argc, &argv, NULL);
   g_test_add_func ("/SpCaptureCursor/basic", test_cursor_basic);
   return g_test_run ();
diff --git a/tests/test-capture.c b/tests/test-capture.c
index e9293940..91c9591f 100644
--- a/tests/test-capture.c
+++ b/tests/test-capture.c
@@ -34,6 +34,8 @@ test_reader_basic (void)
   writer = sp_capture_writer_new ("capture-file", 0);
   g_assert (writer != NULL);
 
+  sp_capture_writer_flush (writer);
+
   reader = sp_capture_reader_new ("capture-file", &error);
   g_assert_no_error (error);
   g_assert (reader != NULL);
@@ -50,9 +52,6 @@ test_reader_basic (void)
 
   sp_capture_writer_flush (writer);
 
-  /* We should have an old header (without end time) */
-  g_assert_cmpint (0, ==, sp_capture_reader_get_end_time (reader));
-
   for (i = 0; i < 100; i++)
     {
       SpCaptureFrameType type = -1;