Replace all the teardown functions with a single one

For the at-spi2-atk tests, we'll move to having a test fixture that
consists of a launched test app with its claimed dbus name.  The
teardown step will terminate the test app.

In this commit, terminate_app() is renamed to fixture_teardown().  It
does not use its arguments yet, because it only uses global variables
from atk_test_util.c, but it will soon.

17 files changed, 172 insertions, 262 deletions

diff --git a/tests/at-spi2-atk/atk_test_accessible.c b/tests/at-spi2-atk/atk_test_accessible.c
index 74579c9b..97065310 100644
--- a/tests/at-spi2-atk/atk_test_accessible.c
+++ b/tests/at-spi2-atk/atk_test_accessible.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-accessible.xml"
 
 static void
-teardown_accessible_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_accessible_get_name (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -388,73 +382,73 @@ void
 atk_test_accessible (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_name",
-                     0, NULL, NULL, atk_test_accessible_get_name, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_description",
-                     0, NULL, NULL, atk_test_accessible_get_description, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_description, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_child_count",
-                     0, NULL, NULL, atk_test_accessible_get_child_count, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_child_count, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_parent",
-                     0, NULL, NULL, atk_test_accessible_get_parent, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_parent, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_child_at_index",
-                     0, NULL, NULL, atk_test_accessible_get_child_at_index, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_child_at_index, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_index_in_parent",
-                     0, NULL, NULL, atk_test_accessible_get_index_in_parent, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_index_in_parent, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_relation_set_1",
-                     0, NULL, NULL, atk_test_accessible_get_relation_set_1, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_relation_set_1, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_relation_set_2",
-                     0, NULL, NULL, atk_test_accessible_get_relation_set_2, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_relation_set_2, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_role",
-                     0, NULL, NULL, atk_test_accessible_get_role, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_role, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_role_name",
-                     0, NULL, NULL, atk_test_accessible_get_role_name, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_role_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_localized_role_name",
-                     0, NULL, NULL, atk_test_accessible_get_localized_role_name, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_localized_role_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_state_set",
-                     0, NULL, NULL, atk_test_accessible_get_state_set, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_state_set, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_attributes",
-                     0, NULL, NULL, atk_test_accessible_get_attributes, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_attributes, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_attributes_as_array",
-                     0, NULL, NULL, atk_test_accessible_get_attributes_as_array, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_attributes_as_array, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_toolkit_name",
-                     0, NULL, NULL, atk_test_accessible_get_toolkit_name, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_toolkit_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_toolkit_version",
-                     0, NULL, NULL, atk_test_accessible_get_toolkit_version, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_toolkit_version, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_atspi_version",
-                     0, NULL, NULL, atk_test_accessible_get_atspi_version, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_atspi_version, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_id",
-                     0, NULL, NULL, atk_test_accessible_get_id, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_id, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_application",
-                     0, NULL, NULL, atk_test_accessible_get_application, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_application, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_action_iface",
-                     0, NULL, NULL, atk_test_accessible_get_action_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_action_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_collection_iface",
-                     0, NULL, NULL, atk_test_accessible_get_collection_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_collection_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_component_iface",
-                     0, NULL, NULL, atk_test_accessible_get_component_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_component_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_document_iface",
-                     0, NULL, NULL, atk_test_accessible_get_document_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_document_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_editable_text_iface",
-                     0, NULL, NULL, atk_test_accessible_get_editable_text_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_editable_text_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_hypertext_iface",
-                     0, NULL, NULL, atk_test_accessible_get_hypertext_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_hypertext_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_image_iface",
-                     0, NULL, NULL, atk_test_accessible_get_image_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_image_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_selection_iface",
-                     0, NULL, NULL, atk_test_accessible_get_selection_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_selection_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_table_iface",
-                     0, NULL, NULL, atk_test_accessible_get_table_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_table_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_text_iface",
-                     0, NULL, NULL, atk_test_accessible_get_text_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_text_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_value_iface",
-                     0, NULL, NULL, atk_test_accessible_get_value_iface, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_value_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_interfaces",
-                     0, NULL, NULL, atk_test_accessible_get_interfaces, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_interfaces, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_object_locale",
-                     0, NULL, NULL, atk_test_accessible_get_object_locale, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_object_locale, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_set_cache_mask",
-                     0, NULL, NULL, atk_test_accessible_set_cache_mask, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_set_cache_mask, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_clear_cache",
-                     0, NULL, NULL, atk_test_accessible_clear_cache, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_clear_cache, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_process_id",
-                     0, NULL, NULL, atk_test_accessible_get_process_id, teardown_accessible_test);
+                     0, NULL, NULL, atk_test_accessible_get_process_id, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_action.c b/tests/at-spi2-atk/atk_test_action.c
index 18990c64..32b2ce10 100644
--- a/tests/at-spi2-atk/atk_test_action.c
+++ b/tests/at-spi2-atk/atk_test_action.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-action.xml"
 
 static void
-teardown_action_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_action_sample_get_interface (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -104,17 +98,17 @@ void
 atk_test_action (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_sample_get_interface",
-                     0, NULL, NULL, atk_test_action_sample_get_interface, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_sample_get_interface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_action_description",
-                     0, NULL, NULL, atk_test_action_get_action_description, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_get_action_description, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_action_name",
-                     0, NULL, NULL, atk_test_action_get_action_name, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_get_action_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_n_actions",
-                     0, NULL, NULL, atk_test_action_get_n_actions, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_get_n_actions, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_key_binding",
-                     0, NULL, NULL, atk_test_action_get_key_binding, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_get_key_binding, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_localized_name",
-                     0, NULL, NULL, atk_test_action_get_localized_name, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_get_localized_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_do_action",
-                     0, NULL, NULL, atk_test_action_do_action, teardown_action_test);
+                     0, NULL, NULL, atk_test_action_do_action, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_collection.c b/tests/at-spi2-atk/atk_test_collection.c
index 184a0663..c5837857 100644
--- a/tests/at-spi2-atk/atk_test_collection.c
+++ b/tests/at-spi2-atk/atk_test_collection.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-collection.xml"
 
 static void
-teardown_collection_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_collection_get_collection_iface (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -156,11 +150,11 @@ void
 atk_test_collection (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_collection_iface",
-                     0, NULL, NULL, atk_test_collection_get_collection_iface, teardown_collection_test);
+                     0, NULL, NULL, atk_test_collection_get_collection_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches",
-                     0, NULL, NULL, atk_test_collection_get_matches, teardown_collection_test);
+                     0, NULL, NULL, atk_test_collection_get_matches, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches_to",
-                     0, NULL, NULL, atk_test_collection_get_matches_to, teardown_collection_test);
+                     0, NULL, NULL, atk_test_collection_get_matches_to, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches_from",
-                     0, NULL, NULL, atk_test_collection_get_matches_from, teardown_collection_test);
+                     0, NULL, NULL, atk_test_collection_get_matches_from, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_component.c b/tests/at-spi2-atk/atk_test_component.c
index 82c6bebe..a4e78b1e 100644
--- a/tests/at-spi2-atk/atk_test_component.c
+++ b/tests/at-spi2-atk/atk_test_component.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-component.xml"
 
 static void
-teardown_component_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_component_sample (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -163,21 +157,21 @@ void
 atk_test_component (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_sample",
-                     0, NULL, NULL, atk_test_component_sample, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_sample, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_contains",
-                     0, NULL, NULL, atk_test_component_contains, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_contains, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_get_accessible_at_point",
-                     0, NULL, NULL, atk_test_component_get_accessible_at_point, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_get_accessible_at_point, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_get_extents",
-                     0, NULL, NULL, atk_test_component_get_extents, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_get_extents, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_get_layer",
-                     0, NULL, NULL, atk_test_component_get_layer, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_get_layer, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_get_mdi_z_order",
-                     0, NULL, NULL, atk_test_component_get_mdi_z_order, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_get_mdi_z_order, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_grab_focus",
-                     0, NULL, NULL, atk_test_component_grab_focus, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_grab_focus, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_get_alpha",
-                     0, NULL, NULL, atk_test_component_get_alpha, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_get_alpha, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_COMP "/atk_test_component_set_extents",
-                     0, NULL, NULL, atk_test_component_set_extents, teardown_component_test);
+                     0, NULL, NULL, atk_test_component_set_extents, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_document.c b/tests/at-spi2-atk/atk_test_document.c
index b0224803..7e020709 100644
--- a/tests/at-spi2-atk/atk_test_document.c
+++ b/tests/at-spi2-atk/atk_test_document.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-document.xml"
 
 static void
-teardown_document_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_document_get_document_iface (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -100,11 +94,11 @@ void
 atk_test_document (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_document_iface",
-                     0, NULL, NULL, atk_test_document_get_document_iface, teardown_document_test);
+                     0, NULL, NULL, atk_test_document_get_document_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_locale",
-                     0, NULL, NULL, atk_test_document_get_locale, teardown_document_test);
+                     0, NULL, NULL, atk_test_document_get_locale, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_attribute_value",
-                     0, NULL, NULL, atk_test_document_get_attribute_value, teardown_document_test);
+                     0, NULL, NULL, atk_test_document_get_attribute_value, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_ACCESSIBLE "/atk_test_document_get_attributes",
-                     0, NULL, NULL, atk_test_document_get_attributes, teardown_document_test);
+                     0, NULL, NULL, atk_test_document_get_attributes, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_editable_text.c b/tests/at-spi2-atk/atk_test_editable_text.c
index 9758bf1c..ddb5b365 100644
--- a/tests/at-spi2-atk/atk_test_editable_text.c
+++ b/tests/at-spi2-atk/atk_test_editable_text.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-editable-text.xml"
 
 static void
-teardown_editable_text_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_editable_text_get_editable_text_iface (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -110,19 +104,19 @@ void
 atk_test_editable_text (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_get_editable_text_iface",
-                     0, NULL, NULL, atk_test_editable_text_get_editable_text_iface, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_get_editable_text_iface, fixture_teardown);
 #if 0
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_set_attributes",
-                     0, NULL, NULL, atk_test_editable_text_set_attributes, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_set_attributes, fixture_teardown);
 #endif
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_insert_text",
-                     0, NULL, NULL, atk_test_editable_text_insert_text, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_insert_text, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_copy_text",
-                     0, NULL, NULL, atk_test_editable_text_copy_text, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_copy_text, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_cut_text",
-                     0, NULL, NULL, atk_test_editable_text_cut_text, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_cut_text, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_delete_text",
-                     0, NULL, NULL, atk_test_editable_text_delete_text, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_delete_text, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_paste_text",
-                     0, NULL, NULL, atk_test_editable_text_paste_text, teardown_editable_text_test);
+                     0, NULL, NULL, atk_test_editable_text_paste_text, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_hyperlink.c b/tests/at-spi2-atk/atk_test_hyperlink.c
index c3293fce..a78ddf71 100644
--- a/tests/at-spi2-atk/atk_test_hyperlink.c
+++ b/tests/at-spi2-atk/atk_test_hyperlink.c
@@ -139,27 +139,21 @@ atk_test_hyperlink_is_valid (gpointer fixture, gconstpointer user_data)
   g_assert (atspi_hyperlink_is_valid (obj, NULL));
 }
 
-static void
-teardown_hyperlink_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
 void
 atk_test_hyperlink (void)
 {
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_n_anchors",
-                     0, NULL, NULL, atk_test_hyperlink_get_n_anchors, teardown_hyperlink_test);
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_uri",
-                     0, NULL, NULL, atk_test_hyperlink_get_uri, teardown_hyperlink_test);
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_object",
-                     0, NULL, NULL, atk_test_hyperlink_get_object, teardown_hyperlink_test);
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_index_range",
-                     0, NULL, NULL, atk_test_hyperlink_get_index_range, teardown_hyperlink_test);
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_start_index",
-                     0, NULL, NULL, atk_test_hyperlink_get_start_index, teardown_hyperlink_test);
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_end_index",
-                     0, NULL, NULL, atk_test_hyperlink_get_end_index, teardown_hyperlink_test);
-  g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_is_valid",
-                     0, NULL, NULL, atk_test_hyperlink_is_valid, teardown_hyperlink_test);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_n_anchors",
+                    0, NULL, NULL, atk_test_hyperlink_get_n_anchors, fixture_teardown);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_uri",
+                    0, NULL, NULL, atk_test_hyperlink_get_uri, fixture_teardown);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_object",
+                    0, NULL, NULL, atk_test_hyperlink_get_object, fixture_teardown);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_index_range",
+                    0, NULL, NULL, atk_test_hyperlink_get_index_range, fixture_teardown);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_start_index",
+                    0, NULL, NULL, atk_test_hyperlink_get_start_index, fixture_teardown);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_end_index",
+                    0, NULL, NULL, atk_test_hyperlink_get_end_index, fixture_teardown);
+  g_test_add_vtable(ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_is_valid",
+                    0, NULL, NULL, atk_test_hyperlink_is_valid, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_hypertext.c b/tests/at-spi2-atk/atk_test_hypertext.c
index 68b8fe55..3571ada1 100644
--- a/tests/at-spi2-atk/atk_test_hypertext.c
+++ b/tests/at-spi2-atk/atk_test_hypertext.c
@@ -77,19 +77,13 @@ atk_test_hypertext_get_link_index (gpointer fixture, gconstpointer user_data)
   g_assert_cmpint (cnt, ==, 1);
 }
 
-static void
-teardown_hypertext_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
 void
 atk_test_hypertext (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_n_links",
-                     0, NULL, NULL, atk_test_hypertext_get_n_links, teardown_hypertext_test);
+                     0, NULL, NULL, atk_test_hypertext_get_n_links, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_links",
-                     0, NULL, NULL, atk_test_hypertext_get_link, teardown_hypertext_test);
+                     0, NULL, NULL, atk_test_hypertext_get_link, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_link_index",
-                     0, NULL, NULL, atk_test_hypertext_get_link_index, teardown_hypertext_test);
+                     0, NULL, NULL, atk_test_hypertext_get_link_index, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_image.c b/tests/at-spi2-atk/atk_test_image.c
index ff42c4cd..24e60746 100644
--- a/tests/at-spi2-atk/atk_test_image.c
+++ b/tests/at-spi2-atk/atk_test_image.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-image.xml"
 
 static void
-teardown_image_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_image_sample_get_interface (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -114,15 +108,15 @@ void
 atk_test_image (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_IMAGE "/atk_test_image_sample_get_interface",
-                     0, NULL, NULL, atk_test_image_sample_get_interface, teardown_image_test);
+                     0, NULL, NULL, atk_test_image_sample_get_interface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_description",
-                     0, NULL, NULL, atk_test_image_get_image_description, teardown_image_test);
+                     0, NULL, NULL, atk_test_image_get_image_description, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_size",
-                     0, NULL, NULL, atk_test_image_get_image_size, teardown_image_test);
+                     0, NULL, NULL, atk_test_image_get_image_size, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_position",
-                     0, NULL, NULL, atk_test_image_get_image_position, teardown_image_test);
+                     0, NULL, NULL, atk_test_image_get_image_position, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_extents",
-                     0, NULL, NULL, atk_test_image_get_image_extents, teardown_image_test);
+                     0, NULL, NULL, atk_test_image_get_image_extents, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_locale",
-                     0, NULL, NULL, atk_test_image_get_image_locale, teardown_image_test);
+                     0, NULL, NULL, atk_test_image_get_image_locale, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_selection.c b/tests/at-spi2-atk/atk_test_selection.c
index 3c2b2b3e..4717f00a 100644
--- a/tests/at-spi2-atk/atk_test_selection.c
+++ b/tests/at-spi2-atk/atk_test_selection.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-selection.xml"
 
 static void
-teardown_selection_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_selection_sample_get_interface (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -176,21 +170,21 @@ void
 atk_test_selection (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_sample_get_interface",
-                     0, NULL, NULL, atk_test_selection_sample_get_interface, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_sample_get_interface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_get_n_selected_children",
-                     0, NULL, NULL, atk_test_selection_get_n_selected_children, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_get_n_selected_children, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_get_selected_child",
-                     0, NULL, NULL, atk_test_selection_get_selected_child, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_get_selected_child, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_select_child",
-                     0, NULL, NULL, atk_test_selection_select_child, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_select_child, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_deselect_selected",
-                     0, NULL, NULL, atk_test_selection_deselect_selected, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_deselect_selected, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_deselect_child",
-                     0, NULL, NULL, atk_test_selection_deselect_child, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_deselect_child, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_is_child_selected",
-                     0, NULL, NULL, atk_test_selection_is_child_selected, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_is_child_selected, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_select_all",
-                     0, NULL, NULL, atk_test_selection_select_all, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_select_all, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_SELECTION "/atk_test_selection_clear_selection",
-                     0, NULL, NULL, atk_test_selection_clear_selection, teardown_selection_test);
+                     0, NULL, NULL, atk_test_selection_clear_selection, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_state_set.c b/tests/at-spi2-atk/atk_test_state_set.c
index 06f86dbb..3ba26411 100644
--- a/tests/at-spi2-atk/atk_test_state_set.c
+++ b/tests/at-spi2-atk/atk_test_state_set.c
@@ -26,12 +26,6 @@
 #define DATA_FILE TESTS_DATA_DIR "/test-accessible.xml"
 
 static void
-teardown_state_set_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
-static void
 atk_test_accessible_get_state_set (gpointer fixture, gconstpointer user_data)
 {
   AtspiAccessible *obj = get_root_obj (DATA_FILE);
@@ -217,23 +211,23 @@ void
 atk_test_state_set (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_accessible_get_state_set",
-                     0, NULL, NULL, atk_test_accessible_get_state_set, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_accessible_get_state_set, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_new",
-                     0, NULL, NULL, atk_test_state_set_new, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_new, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_set_by_name",
-                     0, NULL, NULL, atk_test_state_set_set_by_name, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_set_by_name, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_add",
-                     0, NULL, NULL, atk_test_state_set_add, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_add, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_compare",
-                     0, NULL, NULL, atk_test_state_set_compare, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_compare, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_contains",
-                     0, NULL, NULL, atk_test_state_set_contains, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_contains, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_equals",
-                     0, NULL, NULL, atk_test_state_set_equals, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_equals, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_get_states",
-                     0, NULL, NULL, atk_test_state_set_get_states, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_get_states, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_is_empty",
-                     0, NULL, NULL, atk_test_state_set_is_empty, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_is_empty, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_remove",
-                     0, NULL, NULL, atk_test_state_set_remove, teardown_state_set_test);
+                     0, NULL, NULL, atk_test_state_set_remove, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_table.c b/tests/at-spi2-atk/atk_test_table.c
index 8a673bcc..f4416c45 100644
--- a/tests/at-spi2-atk/atk_test_table.c
+++ b/tests/at-spi2-atk/atk_test_table.c
@@ -413,65 +413,59 @@ atk_test_table_is_selected (gpointer fixture, gconstpointer user_data)
   g_assert_false (atspi_table_is_selected (obj, 1, 0, NULL));
 }
 
-static void
-teardown_table_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
 void
 atk_test_table (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_caption",
-                     0, NULL, NULL, atk_test_table_get_caption, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_caption, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_summary",
-                     0, NULL, NULL, atk_test_table_get_summary, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_summary, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_columns",
-                     0, NULL, NULL, atk_test_table_get_n_columns, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_n_columns, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_rows",
-                     0, NULL, NULL, atk_test_table_get_n_rows, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_n_rows, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_accessible_at",
-                     0, NULL, NULL, atk_test_table_get_accessible_at, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_accessible_at, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_index_at",
-                     0, NULL, NULL, atk_test_table_get_index_at, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_index_at, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_at_index",
-                     0, NULL, NULL, atk_test_table_get_row_at_index, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_row_at_index, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_at_index",
-                     0, NULL, NULL, atk_test_table_get_column_at_index, teardown_table_test);
-  g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_description",
-                     0, NULL, NULL, atk_test_table_get_row_description, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_column_at_index, fixture_teardown);
+  g_test_add_vtable  (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_description",
+                      0, NULL, NULL, atk_test_table_get_row_description, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_description",
-                     0, NULL, NULL, atk_test_table_get_column_description, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_column_description, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_extent_at",
-                     0, NULL, NULL, atk_test_table_get_row_extent_at, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_row_extent_at, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_extent_at",
-                     0, NULL, NULL, atk_test_table_get_column_extent_at, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_column_extent_at, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_header",
-                     0, NULL, NULL, atk_test_table_get_row_header, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_row_header, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_header",
-                     0, NULL, NULL, atk_test_table_get_column_header, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_column_header, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_selected_rows",
-                     0, NULL, NULL, atk_test_table_get_n_selected_rows, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_n_selected_rows, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_selected_rows",
-                     0, NULL, NULL, atk_test_table_get_selected_rows, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_selected_rows, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_selected_columns",
-                     0, NULL, NULL, atk_test_table_get_selected_columns, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_selected_columns, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_selected_columns",
-                     0, NULL, NULL, atk_test_table_get_n_selected_columns, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_n_selected_columns, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_is_row_selected",
-                     0, NULL, NULL, atk_test_table_is_row_selected, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_is_row_selected, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_is_column_selected",
-                     0, NULL, NULL, atk_test_table_is_column_selected, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_is_column_selected, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_add_row_selection",
-                     0, NULL, NULL, atk_test_table_add_row_selection, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_add_row_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_add_column_selection",
-                     0, NULL, NULL, atk_test_table_add_column_selection, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_add_column_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_remove_row_selection",
-                     0, NULL, NULL, atk_test_table_remove_row_selection, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_remove_row_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_remove_column_selection",
-                     0, NULL, NULL, atk_test_table_remove_column_selection, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_remove_column_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_column_extents_at_index",
-                     0, NULL, NULL, atk_test_table_get_row_column_extents_at_index, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_get_row_column_extents_at_index, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE "/atk_test_table_is_selected",
-                     0, NULL, NULL, atk_test_table_is_selected, teardown_table_test);
+                     0, NULL, NULL, atk_test_table_is_selected, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_table_cell.c b/tests/at-spi2-atk/atk_test_table_cell.c
index efb35eab..d5425208 100644
--- a/tests/at-spi2-atk/atk_test_table_cell.c
+++ b/tests/at-spi2-atk/atk_test_table_cell.c
@@ -178,33 +178,27 @@ atk_test_table_cell_get_table (gpointer fixture, gconstpointer user_data)
   g_assert (child == tab);
 }
 
-static void
-teardown_table_cell_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
 void
 atk_test_table_cell (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_accessible_get_table_cell",
-                     0, NULL, NULL, atk_test_accessible_get_table_cell, teardown_table_cell_test);
+                     0, NULL, NULL, atk_test_accessible_get_table_cell, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_column_span",
-                     0, NULL, NULL, atk_test_table_cell_get_column_span, teardown_table_cell_test);
+                     0, NULL, NULL, atk_test_table_cell_get_column_span, fixture_teardown);
   /*
     g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_column_header_cells",
-                       0, NULL, NULL, atk_test_table_cell_get_column_header_cells, teardown_table_cell_test);
+                       0, NULL, NULL, atk_test_table_cell_get_column_header_cells, fixture_teardown);
   */
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_span",
-                     0, NULL, NULL, atk_test_table_cell_get_row_span, teardown_table_cell_test);
+                     0, NULL, NULL, atk_test_table_cell_get_row_span, fixture_teardown);
   /*
     g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_header_cells",
-                       0, NULL, NULL, atk_test_table_cell_get_row_header_cells, teardown_table_cell_test);
+                       0, NULL, NULL, atk_test_table_cell_get_row_header_cells, fixture_teardown);
   */
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_column_span",
-                     0, NULL, NULL, atk_test_table_cell_get_row_column_span, teardown_table_cell_test);
+                     0, NULL, NULL, atk_test_table_cell_get_row_column_span, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_position",
-                     0, NULL, NULL, atk_test_table_cell_get_position, teardown_table_cell_test);
+                     0, NULL, NULL, atk_test_table_cell_get_position, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_table",
-                     0, NULL, NULL, atk_test_table_cell_get_table, teardown_table_cell_test);
+                     0, NULL, NULL, atk_test_table_cell_get_table, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_text.c b/tests/at-spi2-atk/atk_test_text.c
index 085380c1..35ab07f5 100644
--- a/tests/at-spi2-atk/atk_test_text.c
+++ b/tests/at-spi2-atk/atk_test_text.c
@@ -431,53 +431,47 @@ atk_test_text_get_bounded_ranges (gpointer fixture, gconstpointer user_data)
   g_array_free (array, TRUE);
 }
 
-static void
-teardown_text_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
 void
 atk_test_text (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_count",
-                     0, NULL, NULL, atk_test_text_get_character_count, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_character_count, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_text",
-                     0, NULL, NULL, atk_test_text_get_text, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_text, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_caret_offset",
-                     0, NULL, NULL, atk_test_text_get_caret_offset, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_caret_offset, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_text_attributes",
-                     0, NULL, NULL, atk_test_text_get_text_attributes, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_text_attributes, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_attribute_run",
-                     0, NULL, NULL, atk_test_text_get_attribute_run, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_attribute_run, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_text_attribute_value",
-                     0, NULL, NULL, atk_test_text_get_text_attribute_value, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_text_attribute_value, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_defualt_attributes",
-                     0, NULL, NULL, atk_test_text_get_defualt_attributes, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_defualt_attributes, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_set_caret_offset",
-                     0, NULL, NULL, atk_test_text_set_caret_offset, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_set_caret_offset, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_string_at_offset_s1",
-                     0, NULL, NULL, atk_test_text_get_string_at_offset_s1, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_string_at_offset_s1, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_string_at_offset_s2",
-                     0, NULL, NULL, atk_test_text_get_string_at_offset_s2, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_string_at_offset_s2, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_at_offset",
-                     0, NULL, NULL, atk_test_text_get_character_at_offset, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_character_at_offset, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_extents",
-                     0, NULL, NULL, atk_test_text_get_character_extents, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_character_extents, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_offset_at_point",
-                     0, NULL, NULL, atk_test_text_get_offset_at_point, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_offset_at_point, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_range_extents",
-                     0, NULL, NULL, atk_test_text_get_range_extents, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_range_extents, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_bounded_ranges",
-                     0, NULL, NULL, atk_test_text_get_bounded_ranges, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_bounded_ranges, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_n_selections",
-                     0, NULL, NULL, atk_test_text_get_n_selections, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_n_selections, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_get_selection",
-                     0, NULL, NULL, atk_test_text_get_selection, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_get_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_add_selection",
-                     0, NULL, NULL, atk_test_text_add_selection, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_add_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_remove_selection",
-                     0, NULL, NULL, atk_test_text_remove_selection, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_remove_selection, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_TEXT "/atk_test_text_set_selection",
-                     0, NULL, NULL, atk_test_text_set_selection, teardown_text_test);
+                     0, NULL, NULL, atk_test_text_set_selection, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_util.c b/tests/at-spi2-atk/atk_test_util.c
index 9cbd5062..547c9213 100644
--- a/tests/at-spi2-atk/atk_test_util.c
+++ b/tests/at-spi2-atk/atk_test_util.c
@@ -125,7 +125,7 @@ get_root_obj (const char *file_name)
 }
 
 void
-terminate_app (void)
+fixture_teardown (gpointer fixture, gconstpointer user_data)
 {
   int tries = 0;
 
diff --git a/tests/at-spi2-atk/atk_test_util.h b/tests/at-spi2-atk/atk_test_util.h
index d08d23fb..fd900e05 100644
--- a/tests/at-spi2-atk/atk_test_util.h
+++ b/tests/at-spi2-atk/atk_test_util.h
@@ -36,7 +36,7 @@
 extern pid_t child_pid;
 
 AtspiAccessible *get_root_obj (const char *file_name);
-void terminate_app (void);
+void fixture_teardown (gpointer fixture, gconstpointer user_data);
 void clean_exit_on_fail ();
 
 #endif /* _ATK_TEST_UTIL_H */
diff --git a/tests/at-spi2-atk/atk_test_value.c b/tests/at-spi2-atk/atk_test_value.c
index d592d903..6e9e34c9 100644
--- a/tests/at-spi2-atk/atk_test_value.c
+++ b/tests/at-spi2-atk/atk_test_value.c
@@ -108,27 +108,21 @@ atk_test_value_get_text (gpointer fixture, gconstpointer user_data)
   g_free (text);
 }
 
-static void
-teardown_value_test (gpointer fixture, gconstpointer user_data)
-{
-  terminate_app ();
-}
-
 void
 atk_test_value (void)
 {
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_value_iface",
-                     0, NULL, NULL, atk_test_value_get_value_iface, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_get_value_iface, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_minimum_value",
-                     0, NULL, NULL, atk_test_value_get_minimum_value, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_get_minimum_value, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_current_value",
-                     0, NULL, NULL, atk_test_value_get_current_value, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_get_current_value, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_maximum_value",
-                     0, NULL, NULL, atk_test_value_get_maximum_value, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_get_maximum_value, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_set_current_value",
-                     0, NULL, NULL, atk_test_value_set_current_value, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_set_current_value, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_minimum_increment",
-                     0, NULL, NULL, atk_test_value_get_minimum_increment, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_get_minimum_increment, fixture_teardown);
   g_test_add_vtable (ATK_TEST_PATH_VALUE "/atk_test_value_get_text",
-                     0, NULL, NULL, atk_test_value_get_text, teardown_value_test);
+                     0, NULL, NULL, atk_test_value_get_text, fixture_teardown);
 }