Make at-spi2-atk test names more legible by not using concatenation with macros

16 files changed, 162 insertions, 178 deletions

diff --git a/tests/at-spi2-atk/atk_suite.h b/tests/at-spi2-atk/atk_suite.h
index 0ae2e6f1..abcfce43 100644
--- a/tests/at-spi2-atk/atk_suite.h
+++ b/tests/at-spi2-atk/atk_suite.h
@@ -25,22 +25,6 @@
 
 #include <atspi/atspi.h>
 
-#define ATK_TEST_PATH_ACCESSIBLE (const char *) "/Accessible"
-#define ATK_TEST_PATH_ACTION (const char *) "/Action"
-#define ATK_TEST_PATH_COMP (const char *) "/Component"
-#define ATK_TEST_PATH_COLLECTION (const char *) "/Collection"
-#define ATK_TEST_PATH_DOC (const char *) "/Document"
-#define ATK_TEST_PATH_EDIT_TEXT (const char *) "/Editable_Text"
-#define ATK_TEST_PATH_HYPERLINK (const char *) "/Hyperlink"
-#define ATK_TEST_PATH_HYPERTEXT (const char *) "/Hypertext"
-#define ATK_TEST_PATH_IMAGE (const char *) "/Image"
-#define ATK_TEST_PATH_SELECTION (const char *) "/Selection"
-#define ATK_TEST_PATH_STATE_SET (const char *) "/State_Set"
-#define ATK_TEST_PATH_TABLE (const char *) "/Table"
-#define ATK_TEST_PATH_TABLE_CELL (const char *) "/Table_Cell"
-#define ATK_TEST_PATH_TEXT (const char *) "/Text"
-#define ATK_TEST_PATH_VALUE (const char *) "/Value"
-
 void atk_test_accessible (void);
 void atk_test_action (void);
 void atk_test_component (void);
diff --git a/tests/at-spi2-atk/atk_test_accessible.c b/tests/at-spi2-atk/atk_test_accessible.c
index cc7593b5..b8a9665a 100644
--- a/tests/at-spi2-atk/atk_test_accessible.c
+++ b/tests/at-spi2-atk/atk_test_accessible.c
@@ -381,74 +381,74 @@ atk_test_accessible_get_process_id (TestAppFixture *fixture, gconstpointer user_
 void
 atk_test_accessible (void)
 {
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_name",
+  g_test_add ("/accessible/atk_test_accessible_get_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_description",
+  g_test_add ("/accessible/atk_test_accessible_get_description",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_description, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_child_count",
+  g_test_add ("/accessible/atk_test_accessible_get_child_count",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_child_count, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_parent",
+  g_test_add ("/accessible/atk_test_accessible_get_parent",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_parent, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_child_at_index",
+  g_test_add ("/accessible/atk_test_accessible_get_child_at_index",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_child_at_index, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_index_in_parent",
+  g_test_add ("/accessible/atk_test_accessible_get_index_in_parent",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_index_in_parent, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_relation_set_1",
+  g_test_add ("/accessible/atk_test_accessible_get_relation_set_1",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_relation_set_1, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_relation_set_2",
+  g_test_add ("/accessible/atk_test_accessible_get_relation_set_2",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_relation_set_2, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_role",
+  g_test_add ("/accessible/atk_test_accessible_get_role",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_role, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_role_name",
+  g_test_add ("/accessible/atk_test_accessible_get_role_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_role_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_localized_role_name",
+  g_test_add ("/accessible/atk_test_accessible_get_localized_role_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_localized_role_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_state_set",
+  g_test_add ("/accessible/atk_test_accessible_get_state_set",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_state_set, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_attributes",
+  g_test_add ("/accessible/atk_test_accessible_get_attributes",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_attributes, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_attributes_as_array",
+  g_test_add ("/accessible/atk_test_accessible_get_attributes_as_array",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_attributes_as_array, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_toolkit_name",
+  g_test_add ("/accessible/atk_test_accessible_get_toolkit_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_toolkit_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_toolkit_version",
+  g_test_add ("/accessible/atk_test_accessible_get_toolkit_version",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_toolkit_version, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_atspi_version",
+  g_test_add ("/accessible/atk_test_accessible_get_atspi_version",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_atspi_version, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_id",
+  g_test_add ("/accessible/atk_test_accessible_get_id",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_id, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_application",
+  g_test_add ("/accessible/atk_test_accessible_get_application",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_application, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_action_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_action_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_action_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_collection_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_collection_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_collection_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_component_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_component_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_component_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_document_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_document_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_document_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_editable_text_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_editable_text_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_editable_text_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_hypertext_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_hypertext_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_hypertext_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_image_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_image_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_image_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_selection_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_selection_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_selection_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_table_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_table_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_table_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_text_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_text_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_text_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_value_iface",
+  g_test_add ("/accessible/atk_test_accessible_get_value_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_value_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_interfaces",
+  g_test_add ("/accessible/atk_test_accessible_get_interfaces",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_interfaces, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_object_locale",
+  g_test_add ("/accessible/atk_test_accessible_get_object_locale",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_object_locale, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_set_cache_mask",
+  g_test_add ("/accessible/atk_test_accessible_set_cache_mask",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_set_cache_mask, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_clear_cache",
+  g_test_add ("/accessible/atk_test_accessible_clear_cache",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_clear_cache, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACCESSIBLE "/atk_test_accessible_get_process_id",
+  g_test_add ("/accessible/atk_test_accessible_get_process_id",
               TestAppFixture, DATA_FILE, fixture_setup, 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 f520f646..b079a8e0 100644
--- a/tests/at-spi2-atk/atk_test_action.c
+++ b/tests/at-spi2-atk/atk_test_action.c
@@ -97,18 +97,18 @@ atk_test_action_do_action (TestAppFixture *fixture, gconstpointer user_data)
 void
 atk_test_action (void)
 {
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_sample_get_interface",
+  g_test_add ("/action/atk_test_action_sample_get_interface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_sample_get_interface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_get_action_description",
+  g_test_add ("/action/atk_test_action_get_action_description",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_action_description, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_get_action_name",
+  g_test_add ("/action/atk_test_action_get_action_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_action_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_get_n_actions",
+  g_test_add ("/action/atk_test_action_get_n_actions",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_n_actions, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_get_key_binding",
+  g_test_add ("/action/atk_test_action_get_key_binding",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_key_binding, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_get_localized_name",
+  g_test_add ("/action/atk_test_action_get_localized_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_localized_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_ACTION "/atk_test_action_do_action",
+  g_test_add ("/action/atk_test_action_do_action",
               TestAppFixture, DATA_FILE, fixture_setup, 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 ee099d07..5fd4d911 100644
--- a/tests/at-spi2-atk/atk_test_collection.c
+++ b/tests/at-spi2-atk/atk_test_collection.c
@@ -149,12 +149,12 @@ atk_test_collection_get_matches_from (TestAppFixture *fixture, gconstpointer use
 void
 atk_test_collection (void)
 {
-  g_test_add (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_collection_iface",
+  g_test_add ("/collection/atk_test_collection_get_collection_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_collection_get_collection_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches",
+  g_test_add ("/collection/atk_test_collection_get_matches",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_collection_get_matches, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches_to",
+  g_test_add ("/collection/atk_test_collection_get_matches_to",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_collection_get_matches_to, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COLLECTION "/atk_test_collection_get_matches_from",
+  g_test_add ("/collection/atk_test_collection_get_matches_from",
               TestAppFixture, DATA_FILE, fixture_setup, 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 8aebf035..2bdb6f20 100644
--- a/tests/at-spi2-atk/atk_test_component.c
+++ b/tests/at-spi2-atk/atk_test_component.c
@@ -156,22 +156,22 @@ atk_test_component_set_extents (TestAppFixture *fixture, gconstpointer user_data
 void
 atk_test_component (void)
 {
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_sample",
+  g_test_add ("/component/atk_test_component_sample",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_sample, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_contains",
+  g_test_add ("/component/atk_test_component_contains",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_contains, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_get_accessible_at_point",
+  g_test_add ("/component/atk_test_component_get_accessible_at_point",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_get_accessible_at_point, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_get_extents",
+  g_test_add ("/component/atk_test_component_get_extents",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_get_extents, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_get_layer",
+  g_test_add ("/component/atk_test_component_get_layer",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_get_layer, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_get_mdi_z_order",
+  g_test_add ("/component/atk_test_component_get_mdi_z_order",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_get_mdi_z_order, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_grab_focus",
+  g_test_add ("/component/atk_test_component_grab_focus",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_grab_focus, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_get_alpha",
+  g_test_add ("/component/atk_test_component_get_alpha",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_component_get_alpha, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_COMP "/atk_test_component_set_extents",
+  g_test_add ("/component/atk_test_component_set_extents",
               TestAppFixture, DATA_FILE, fixture_setup, 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 d9f0f9a1..fd83cb8d 100644
--- a/tests/at-spi2-atk/atk_test_document.c
+++ b/tests/at-spi2-atk/atk_test_document.c
@@ -93,12 +93,12 @@ atk_test_document_get_attributes (TestAppFixture *fixture, gconstpointer user_da
 void
 atk_test_document (void)
 {
-  g_test_add (ATK_TEST_PATH_DOC "/atk_test_document_get_document_iface",
+  g_test_add ("/document/atk_test_document_get_document_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_document_get_document_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_DOC "/atk_test_document_get_locale",
+  g_test_add ("/document/atk_test_document_get_locale",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_document_get_locale, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_DOC "/atk_test_document_get_attribute_value",
+  g_test_add ("/document/atk_test_document_get_attribute_value",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_document_get_attribute_value, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_DOC "/atk_test_document_get_attributes",
+  g_test_add ("/document/atk_test_document_get_attributes",
               TestAppFixture, DATA_FILE, fixture_setup, 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 a0ad323d..dc78594f 100644
--- a/tests/at-spi2-atk/atk_test_editable_text.c
+++ b/tests/at-spi2-atk/atk_test_editable_text.c
@@ -103,20 +103,20 @@ atk_test_editable_text_paste_text (TestAppFixture *fixture, gconstpointer user_d
 void
 atk_test_editable_text (void)
 {
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_get_editable_text_iface",
+  g_test_add ("/editable_text/atk_test_editable_text_get_editable_text_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_editable_text_get_editable_text_iface, fixture_teardown);
 #if 0
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_set_attributes",
+  g_test_add ("/editable_text/atk_test_editable_text_set_attributes",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_editable_text_set_attributes, fixture_teardown);
 #endif
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_insert_text",
+  g_test_add ("/editable_text/atk_test_editable_text_insert_text",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_editable_text_insert_text, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_copy_text",
+  g_test_add ("/editable_text/atk_test_editable_text_copy_text",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_editable_text_copy_text, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_cut_text",
+  g_test_add ("/editable_text/atk_test_editable_text_cut_text",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_editable_text_cut_text, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_delete_text",
+  g_test_add ("/editable_text/atk_test_editable_text_delete_text",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_editable_text_delete_text, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_EDIT_TEXT "/atk_test_editable_text_paste_text",
+  g_test_add ("/editable_text/atk_test_editable_text_paste_text",
               TestAppFixture, DATA_FILE, fixture_setup, 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 78bfeedd..81bec14d 100644
--- a/tests/at-spi2-atk/atk_test_hyperlink.c
+++ b/tests/at-spi2-atk/atk_test_hyperlink.c
@@ -142,18 +142,18 @@ atk_test_hyperlink_is_valid (TestAppFixture *fixture, gconstpointer user_data)
 void
 atk_test_hyperlink (void)
 {
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_n_anchors",
+  g_test_add ("/hyperlink/atk_test_hyperlink_get_n_anchors",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hyperlink_get_n_anchors, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_uri",
+  g_test_add ("/hyperlink/atk_test_hyperlink_get_uri",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hyperlink_get_uri, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_object",
+  g_test_add ("/hyperlink/atk_test_hyperlink_get_object",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hyperlink_get_object, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_index_range",
+  g_test_add ("/hyperlink/atk_test_hyperlink_get_index_range",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hyperlink_get_index_range, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_start_index",
+  g_test_add ("/hyperlink/atk_test_hyperlink_get_start_index",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hyperlink_get_start_index, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_get_end_index",
+  g_test_add ("/hyperlink/atk_test_hyperlink_get_end_index",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hyperlink_get_end_index, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hyperlink_is_valid",
+  g_test_add ("/hyperlink/atk_test_hyperlink_is_valid",
               TestAppFixture, DATA_FILE, fixture_setup, 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 e4fd862d..b193c8d4 100644
--- a/tests/at-spi2-atk/atk_test_hypertext.c
+++ b/tests/at-spi2-atk/atk_test_hypertext.c
@@ -80,10 +80,10 @@ atk_test_hypertext_get_link_index (TestAppFixture *fixture, gconstpointer user_d
 void
 atk_test_hypertext (void)
 {
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_n_links",
+  g_test_add ("/hypertext/atk_test_hypertext_get_n_links",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hypertext_get_n_links, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_links",
+  g_test_add ("/hypertext/atk_test_hypertext_get_links",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_hypertext_get_link, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_HYPERTEXT "/atk_test_hypertext_get_link_index",
+  g_test_add ("/hypertext/atk_test_hypertext_get_link_index",
               TestAppFixture, DATA_FILE, fixture_setup, 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 f4bc4d06..eb8b2484 100644
--- a/tests/at-spi2-atk/atk_test_image.c
+++ b/tests/at-spi2-atk/atk_test_image.c
@@ -107,16 +107,16 @@ atk_test_image_get_image_locale (TestAppFixture *fixture, gconstpointer user_dat
 void
 atk_test_image (void)
 {
-  g_test_add (ATK_TEST_PATH_IMAGE "/atk_test_image_sample_get_interface",
+  g_test_add ("/image/atk_test_image_sample_get_interface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_image_sample_get_interface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_description",
+  g_test_add ("/image/atk_test_image_get_image_description",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_image_get_image_description, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_size",
+  g_test_add ("/image/atk_test_image_get_image_size",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_image_get_image_size, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_position",
+  g_test_add ("/image/atk_test_image_get_image_position",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_image_get_image_position, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_extents",
+  g_test_add ("/image/atk_test_image_get_image_extents",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_image_get_image_extents, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_IMAGE "/atk_test_image_get_image_locale",
+  g_test_add ("/image/atk_test_image_get_image_locale",
               TestAppFixture, DATA_FILE, fixture_setup, 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 c706b0d9..e9e4f16d 100644
--- a/tests/at-spi2-atk/atk_test_selection.c
+++ b/tests/at-spi2-atk/atk_test_selection.c
@@ -169,22 +169,22 @@ atk_test_selection_clear_selection (TestAppFixture *fixture, gconstpointer user_
 void
 atk_test_selection (void)
 {
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_sample_get_interface",
+  g_test_add ("/selection/atk_test_selection_sample_get_interface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_sample_get_interface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_get_n_selected_children",
+  g_test_add ("/selection/atk_test_selection_get_n_selected_children",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_get_n_selected_children, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_get_selected_child",
+  g_test_add ("/selection/atk_test_selection_get_selected_child",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_get_selected_child, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_select_child",
+  g_test_add ("/selection/atk_test_selection_select_child",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_select_child, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_deselect_selected",
+  g_test_add ("/selection/atk_test_selection_deselect_selected",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_deselect_selected, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_deselect_child",
+  g_test_add ("/selection/atk_test_selection_deselect_child",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_deselect_child, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_is_child_selected",
+  g_test_add ("/selection/atk_test_selection_is_child_selected",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_is_child_selected, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_select_all",
+  g_test_add ("/selection/atk_test_selection_select_all",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_selection_select_all, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_SELECTION "/atk_test_selection_clear_selection",
+  g_test_add ("/selection/atk_test_selection_clear_selection",
               TestAppFixture, DATA_FILE, fixture_setup, 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 d32fa875..373d9ed2 100644
--- a/tests/at-spi2-atk/atk_test_state_set.c
+++ b/tests/at-spi2-atk/atk_test_state_set.c
@@ -210,24 +210,24 @@ atk_test_state_set_remove (TestAppFixture *fixture, gconstpointer user_data)
 void
 atk_test_state_set (void)
 {
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_accessible_get_state_set",
+  g_test_add ("/state_set/atk_test_accessible_get_state_set",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_state_set, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_new",
+  g_test_add ("/state_set/atk_test_state_set_new",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_new, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_set_by_name",
+  g_test_add ("/state_set/atk_test_state_set_set_by_name",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_set_by_name, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_add",
+  g_test_add ("/state_set/atk_test_state_set_add",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_add, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_compare",
+  g_test_add ("/state_set/atk_test_state_set_compare",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_compare, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_contains",
+  g_test_add ("/state_set/atk_test_state_set_contains",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_contains, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_equals",
+  g_test_add ("/state_set/atk_test_state_set_equals",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_equals, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_get_states",
+  g_test_add ("/state_set/atk_test_state_set_get_states",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_get_states, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_is_empty",
+  g_test_add ("/state_set/atk_test_state_set_is_empty",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_state_set_is_empty, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_STATE_SET "/atk_test_state_set_remove",
+  g_test_add ("/state_set/atk_test_state_set_remove",
               TestAppFixture, DATA_FILE, fixture_setup, 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 6365298d..17a9ec8c 100644
--- a/tests/at-spi2-atk/atk_test_table.c
+++ b/tests/at-spi2-atk/atk_test_table.c
@@ -416,56 +416,56 @@ atk_test_table_is_selected (TestAppFixture *fixture, gconstpointer user_data)
 void
 atk_test_table (void)
 {
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_caption",
+  g_test_add ("/table/atk_test_table_get_caption",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_caption, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_summary",
+  g_test_add ("/table/atk_test_table_get_summary",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_summary, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_columns",
+  g_test_add ("/table/atk_test_table_get_n_columns",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_n_columns, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_rows",
+  g_test_add ("/table/atk_test_table_get_n_rows",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_n_rows, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_accessible_at",
+  g_test_add ("/table/atk_test_table_get_accessible_at",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_accessible_at, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_index_at",
+  g_test_add ("/table/atk_test_table_get_index_at",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_index_at, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_at_index",
+  g_test_add ("/table/atk_test_table_get_row_at_index",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_row_at_index, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_at_index",
+  g_test_add ("/table/atk_test_table_get_column_at_index",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_column_at_index, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_description",
+  g_test_add ("/table/atk_test_table_get_row_description",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_row_description, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_description",
+  g_test_add ("/table/atk_test_table_get_column_description",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_column_description, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_extent_at",
+  g_test_add ("/table/atk_test_table_get_row_extent_at",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_row_extent_at, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_extent_at",
+  g_test_add ("/table/atk_test_table_get_column_extent_at",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_column_extent_at, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_header",
+  g_test_add ("/table/atk_test_table_get_row_header",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_row_header, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_column_header",
+  g_test_add ("/table/atk_test_table_get_column_header",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_column_header, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_selected_rows",
+  g_test_add ("/table/atk_test_table_get_n_selected_rows",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_n_selected_rows, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_selected_rows",
+  g_test_add ("/table/atk_test_table_get_selected_rows",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_selected_rows, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_selected_columns",
+  g_test_add ("/table/atk_test_table_get_selected_columns",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_selected_columns, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_n_selected_columns",
+  g_test_add ("/table/atk_test_table_get_n_selected_columns",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_n_selected_columns, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_is_row_selected",
+  g_test_add ("/table/atk_test_table_is_row_selected",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_is_row_selected, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_is_column_selected",
+  g_test_add ("/table/atk_test_table_is_column_selected",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_is_column_selected, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_add_row_selection",
+  g_test_add ("/table/atk_test_table_add_row_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_add_row_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_add_column_selection",
+  g_test_add ("/table/atk_test_table_add_column_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_add_column_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_remove_row_selection",
+  g_test_add ("/table/atk_test_table_remove_row_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_remove_row_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_remove_column_selection",
+  g_test_add ("/table/atk_test_table_remove_column_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_remove_column_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_get_row_column_extents_at_index",
+  g_test_add ("/table/atk_test_table_get_row_column_extents_at_index",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_get_row_column_extents_at_index, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE "/atk_test_table_is_selected",
+  g_test_add ("/table/atk_test_table_is_selected",
               TestAppFixture, DATA_FILE, fixture_setup, 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 d30b8044..463f1a16 100644
--- a/tests/at-spi2-atk/atk_test_table_cell.c
+++ b/tests/at-spi2-atk/atk_test_table_cell.c
@@ -181,24 +181,24 @@ atk_test_table_cell_get_table (TestAppFixture *fixture, gconstpointer user_data)
 void
 atk_test_table_cell (void)
 {
-  g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_accessible_get_table_cell",
+  g_test_add ("/table_cell/atk_test_accessible_get_table_cell",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_accessible_get_table_cell, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_column_span",
+  g_test_add ("/table_cell/atk_test_table_cell_get_column_span",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_cell_get_column_span, fixture_teardown);
   /*
-    g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_column_header_cells",
+    g_test_add ("/table_cell/atk_test_table_cell_get_column_header_cells",
                 TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_cell_get_column_header_cells, fixture_teardown);
   */
-  g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_span",
+  g_test_add ("/table_cell/atk_test_table_cell_get_row_span",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_cell_get_row_span, fixture_teardown);
   /*
-    g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_header_cells",
+    g_test_add ("/table_cell/atk_test_table_cell_get_row_header_cells",
                 TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_cell_get_row_header_cells, fixture_teardown);
   */
-  g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_row_column_span",
+  g_test_add ("/table_cell/atk_test_table_cell_get_row_column_span",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_cell_get_row_column_span, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_position",
+  g_test_add ("/table_cell/atk_test_table_cell_get_position",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_table_cell_get_position, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TABLE_CELL "/atk_test_table_cell_get_table",
+  g_test_add ("/table_cell/atk_test_table_cell_get_table",
               TestAppFixture, DATA_FILE, fixture_setup, 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 c8e41ef6..a5fb7f83 100644
--- a/tests/at-spi2-atk/atk_test_text.c
+++ b/tests/at-spi2-atk/atk_test_text.c
@@ -434,44 +434,44 @@ atk_test_text_get_bounded_ranges (TestAppFixture *fixture, gconstpointer user_da
 void
 atk_test_text (void)
 {
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_count",
+  g_test_add ("/text/atk_test_text_get_character_count",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_character_count, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_text",
+  g_test_add ("/text/atk_test_text_get_text",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_text, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_caret_offset",
+  g_test_add ("/text/atk_test_text_get_caret_offset",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_caret_offset, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_text_attributes",
+  g_test_add ("/text/atk_test_text_get_text_attributes",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_text_attributes, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_attribute_run",
+  g_test_add ("/text/atk_test_text_get_attribute_run",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_attribute_run, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_text_attribute_value",
+  g_test_add ("/text/atk_test_text_get_text_attribute_value",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_text_attribute_value, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_default_attributes",
+  g_test_add ("/text/atk_test_text_get_default_attributes",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_default_attributes, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_set_caret_offset",
+  g_test_add ("/text/atk_test_text_set_caret_offset",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_set_caret_offset, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_string_at_offset_s1",
+  g_test_add ("/text/atk_test_text_get_string_at_offset_s1",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_string_at_offset_s1, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_string_at_offset_s2",
+  g_test_add ("/text/atk_test_text_get_string_at_offset_s2",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_string_at_offset_s2, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_at_offset",
+  g_test_add ("/text/atk_test_text_get_character_at_offset",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_character_at_offset, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_character_extents",
+  g_test_add ("/text/atk_test_text_get_character_extents",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_character_extents, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_offset_at_point",
+  g_test_add ("/text/atk_test_text_get_offset_at_point",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_offset_at_point, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_range_extents",
+  g_test_add ("/text/atk_test_text_get_range_extents",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_range_extents, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_bounded_ranges",
+  g_test_add ("/text/atk_test_text_get_bounded_ranges",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_bounded_ranges, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_n_selections",
+  g_test_add ("/text/atk_test_text_get_n_selections",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_n_selections, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_get_selection",
+  g_test_add ("/text/atk_test_text_get_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_get_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_add_selection",
+  g_test_add ("/text/atk_test_text_add_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_add_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_remove_selection",
+  g_test_add ("/text/atk_test_text_remove_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_remove_selection, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_TEXT "/atk_test_text_set_selection",
+  g_test_add ("/text/atk_test_text_set_selection",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_text_set_selection, fixture_teardown);
 }
diff --git a/tests/at-spi2-atk/atk_test_value.c b/tests/at-spi2-atk/atk_test_value.c
index 14f45e04..db2cef24 100644
--- a/tests/at-spi2-atk/atk_test_value.c
+++ b/tests/at-spi2-atk/atk_test_value.c
@@ -111,18 +111,18 @@ atk_test_value_get_text (TestAppFixture *fixture, gconstpointer user_data)
 void
 atk_test_value (void)
 {
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_get_value_iface",
+  g_test_add ("/value/atk_test_value_get_value_iface",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_get_value_iface, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_get_minimum_value",
+  g_test_add ("/value/atk_test_value_get_minimum_value",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_get_minimum_value, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_get_current_value",
+  g_test_add ("/value/atk_test_value_get_current_value",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_get_current_value, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_get_maximum_value",
+  g_test_add ("/value/atk_test_value_get_maximum_value",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_get_maximum_value, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_set_current_value",
+  g_test_add ("/value/atk_test_value_set_current_value",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_set_current_value, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_get_minimum_increment",
+  g_test_add ("/value/atk_test_value_get_minimum_increment",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_get_minimum_increment, fixture_teardown);
-  g_test_add (ATK_TEST_PATH_VALUE "/atk_test_value_get_text",
+  g_test_add ("/value/atk_test_value_get_text",
               TestAppFixture, DATA_FILE, fixture_setup, atk_test_value_get_text, fixture_teardown);
 }