1 files changed, 16 insertions, 2 deletions
diff --git a/tests/at-spi2-atk/atk_suite.c b/tests/at-spi2-atk/atk_suite.c
index f70e8cb8..7132c148 100644
--- a/tests/at-spi2-atk/atk_suite.c
+++ b/tests/at-spi2-atk/atk_suite.c
@@ -53,11 +53,25 @@ atk_suite_build (void)
 int
 main (int argc, char **argv)
 {
+  int init_result;
+
   g_test_init (&argc, &argv, NULL);
 
-  clean_exit_on_fail ();
+  init_result = atspi_init ();
+  if (init_result != 0)
+    {
+      g_error ("Could not initialize atspi, code %d", init_result);
+    }
+
+  fixture_listener_init ();
 
   atk_suite_build ();
 
-  return g_test_run ();
+  int result = g_test_run ();
+  g_assert_cmpint (result, ==, 0);
+
+  int leaked = atspi_exit ();
+  g_assert_cmpint (leaked, ==, 0);
+
+  return 0;
 }