diff --git a/qa/unittests/eeschema/data/eagle_schematics/eagle-import-testfile.brd b/qa/data/eeschema/eagle_schematics/eagle-import-testfile.brd
similarity index 100%
rename from qa/unittests/eeschema/data/eagle_schematics/eagle-import-testfile.brd
rename to qa/data/eeschema/eagle_schematics/eagle-import-testfile.brd
diff --git a/qa/unittests/eeschema/data/eagle_schematics/eagle-import-testfile.sch b/qa/data/eeschema/eagle_schematics/eagle-import-testfile.sch
similarity index 100%
rename from qa/unittests/eeschema/data/eagle_schematics/eagle-import-testfile.sch
rename to qa/data/eeschema/eagle_schematics/eagle-import-testfile.sch
diff --git a/qa/unittests/eeschema/data/netlists/bus_entries/bus_entries.kicad_pro b/qa/data/eeschema/netlists/bus_entries/bus_entries.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/bus_entries/bus_entries.kicad_pro
rename to qa/data/eeschema/netlists/bus_entries/bus_entries.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/bus_entries/bus_entries.kicad_sch b/qa/data/eeschema/netlists/bus_entries/bus_entries.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/bus_entries/bus_entries.kicad_sch
rename to qa/data/eeschema/netlists/bus_entries/bus_entries.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/bus_entries/bus_entries.net b/qa/data/eeschema/netlists/bus_entries/bus_entries.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/bus_entries/bus_entries.net
rename to qa/data/eeschema/netlists/bus_entries/bus_entries.net
diff --git a/qa/unittests/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_pro b/qa/data/eeschema/netlists/bus_junctions/bus_junctions.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_pro
rename to qa/data/eeschema/netlists/bus_junctions/bus_junctions.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_sch b/qa/data/eeschema/netlists/bus_junctions/bus_junctions.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/bus_junctions/bus_junctions.kicad_sch
rename to qa/data/eeschema/netlists/bus_junctions/bus_junctions.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/bus_junctions/bus_junctions.net b/qa/data/eeschema/netlists/bus_junctions/bus_junctions.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/bus_junctions/bus_junctions.net
rename to qa/data/eeschema/netlists/bus_junctions/bus_junctions.net
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/ampli_ht.kicad_sch b/qa/data/eeschema/netlists/complex_hierarchy/ampli_ht.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/ampli_ht.kicad_sch
rename to qa/data/eeschema/netlists/complex_hierarchy/ampli_ht.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/ampli_ht.sch b/qa/data/eeschema/netlists/complex_hierarchy/ampli_ht.sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/ampli_ht.sch
rename to qa/data/eeschema/netlists/complex_hierarchy/ampli_ht.sch
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy-cache.lib b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy-cache.lib
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy-cache.lib
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy-cache.lib
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.kicad_pro b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.kicad_pro
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.kicad_sch b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.kicad_sch
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.net b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.net
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.net
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.pro b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.pro
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.pro
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.sch b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy.sch
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy.sch
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy_schlib.lib b/qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy_schlib.lib
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/complex_hierarchy_schlib.lib
rename to qa/data/eeschema/netlists/complex_hierarchy/complex_hierarchy_schlib.lib
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/fp-lib-table b/qa/data/eeschema/netlists/complex_hierarchy/fp-lib-table
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/fp-lib-table
rename to qa/data/eeschema/netlists/complex_hierarchy/fp-lib-table
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy/sym-lib-table b/qa/data/eeschema/netlists/complex_hierarchy/sym-lib-table
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy/sym-lib-table
rename to qa/data/eeschema/netlists/complex_hierarchy/sym-lib-table
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_pro b/qa/data/eeschema/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_pro
rename to qa/data/eeschema/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_sch b/qa/data/eeschema/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_sch
rename to qa/data/eeschema/netlists/complex_hierarchy_shared/ampli_ht/ampli_ht.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/filter.kicad_sch b/qa/data/eeschema/netlists/complex_hierarchy_shared/ampli_ht/filter.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/ampli_ht/filter.kicad_sch
rename to qa/data/eeschema/netlists/complex_hierarchy_shared/ampli_ht/filter.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_pro b/qa/data/eeschema/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_pro
rename to qa/data/eeschema/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_sch b/qa/data/eeschema/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_sch
rename to qa/data/eeschema/netlists/complex_hierarchy_shared/complex_hierarchy.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/group_bus_matching/group_bus_matching.kicad_pro b/qa/data/eeschema/netlists/group_bus_matching/group_bus_matching.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/group_bus_matching/group_bus_matching.kicad_pro
rename to qa/data/eeschema/netlists/group_bus_matching/group_bus_matching.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/group_bus_matching/group_bus_matching.kicad_sch b/qa/data/eeschema/netlists/group_bus_matching/group_bus_matching.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/group_bus_matching/group_bus_matching.kicad_sch
rename to qa/data/eeschema/netlists/group_bus_matching/group_bus_matching.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/group_bus_matching/group_bus_matching.net b/qa/data/eeschema/netlists/group_bus_matching/group_bus_matching.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/group_bus_matching/group_bus_matching.net
rename to qa/data/eeschema/netlists/group_bus_matching/group_bus_matching.net
diff --git a/qa/unittests/eeschema/data/netlists/group_bus_matching/subsheet1.kicad_sch b/qa/data/eeschema/netlists/group_bus_matching/subsheet1.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/group_bus_matching/subsheet1.kicad_sch
rename to qa/data/eeschema/netlists/group_bus_matching/subsheet1.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/group_bus_matching/subsheet2.kicad_sch b/qa/data/eeschema/netlists/group_bus_matching/subsheet2.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/group_bus_matching/subsheet2.kicad_sch
rename to qa/data/eeschema/netlists/group_bus_matching/subsheet2.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/noconnects/noconnects.kicad_pro b/qa/data/eeschema/netlists/noconnects/noconnects.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/noconnects/noconnects.kicad_pro
rename to qa/data/eeschema/netlists/noconnects/noconnects.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/noconnects/noconnects.kicad_sch b/qa/data/eeschema/netlists/noconnects/noconnects.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/noconnects/noconnects.kicad_sch
rename to qa/data/eeschema/netlists/noconnects/noconnects.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/noconnects/noconnects.net b/qa/data/eeschema/netlists/noconnects/noconnects.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/noconnects/noconnects.net
rename to qa/data/eeschema/netlists/noconnects/noconnects.net
diff --git a/qa/unittests/eeschema/data/netlists/prefix_bus_alias/prefix_bus_alias.kicad_pro b/qa/data/eeschema/netlists/prefix_bus_alias/prefix_bus_alias.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/prefix_bus_alias/prefix_bus_alias.kicad_pro
rename to qa/data/eeschema/netlists/prefix_bus_alias/prefix_bus_alias.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/prefix_bus_alias/prefix_bus_alias.kicad_sch b/qa/data/eeschema/netlists/prefix_bus_alias/prefix_bus_alias.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/prefix_bus_alias/prefix_bus_alias.kicad_sch
rename to qa/data/eeschema/netlists/prefix_bus_alias/prefix_bus_alias.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/prefix_bus_alias/prefix_bus_alias.net b/qa/data/eeschema/netlists/prefix_bus_alias/prefix_bus_alias.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/prefix_bus_alias/prefix_bus_alias.net
rename to qa/data/eeschema/netlists/prefix_bus_alias/prefix_bus_alias.net
diff --git a/qa/unittests/eeschema/data/netlists/prefix_bus_alias/subsheet1.kicad_sch b/qa/data/eeschema/netlists/prefix_bus_alias/subsheet1.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/prefix_bus_alias/subsheet1.kicad_sch
rename to qa/data/eeschema/netlists/prefix_bus_alias/subsheet1.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/prefix_bus_alias/subsheet2.kicad_sch b/qa/data/eeschema/netlists/prefix_bus_alias/subsheet2.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/prefix_bus_alias/subsheet2.kicad_sch
rename to qa/data/eeschema/netlists/prefix_bus_alias/subsheet2.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/Sub.kicad_sch b/qa/data/eeschema/netlists/test_global_promotion/Sub.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/Sub.kicad_sch
rename to qa/data/eeschema/netlists/test_global_promotion/Sub.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/Sub.sch b/qa/data/eeschema/netlists/test_global_promotion/Sub.sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/Sub.sch
rename to qa/data/eeschema/netlists/test_global_promotion/Sub.sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion-cache.lib b/qa/data/eeschema/netlists/test_global_promotion/test_global_promotion-cache.lib
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion-cache.lib
rename to qa/data/eeschema/netlists/test_global_promotion/test_global_promotion-cache.lib
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.kicad_pro b/qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.kicad_pro
rename to qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.kicad_sch b/qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.kicad_sch
rename to qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.net b/qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.net
rename to qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.net
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.pro b/qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.pro
rename to qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.pro
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.sch b/qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion/test_global_promotion.sch
rename to qa/data/eeschema/netlists/test_global_promotion/test_global_promotion.sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/subsheet.kicad_sch b/qa/data/eeschema/netlists/test_global_promotion_2/subsheet.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/subsheet.kicad_sch
rename to qa/data/eeschema/netlists/test_global_promotion_2/subsheet.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/subsheet.sch b/qa/data/eeschema/netlists/test_global_promotion_2/subsheet.sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/subsheet.sch
rename to qa/data/eeschema/netlists/test_global_promotion_2/subsheet.sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2-cache.lib b/qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2-cache.lib
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2-cache.lib
rename to qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2-cache.lib
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.kicad_pro b/qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.kicad_pro
rename to qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.kicad_sch b/qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.kicad_sch
rename to qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.net b/qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.net
rename to qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.net
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.pro b/qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.pro
rename to qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.pro
diff --git a/qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.sch b/qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_global_promotion_2/test_global_promotion_2.sch
rename to qa/data/eeschema/netlists/test_global_promotion_2/test_global_promotion_2.sch
diff --git a/qa/unittests/eeschema/data/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch b/qa/data/eeschema/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch
rename to qa/data/eeschema/netlists/test_hier_renaming/LED_matrix_x6.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_pro b/qa/data/eeschema/netlists/test_hier_renaming/test_hier_renaming.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_pro
rename to qa/data/eeschema/netlists/test_hier_renaming/test_hier_renaming.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch b/qa/data/eeschema/netlists/test_hier_renaming/test_hier_renaming.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.kicad_sch
rename to qa/data/eeschema/netlists/test_hier_renaming/test_hier_renaming.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net b/qa/data/eeschema/netlists/test_hier_renaming/test_hier_renaming.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/test_hier_renaming/test_hier_renaming.net
rename to qa/data/eeschema/netlists/test_hier_renaming/test_hier_renaming.net
diff --git a/qa/unittests/eeschema/data/netlists/top_level_hier_pins/subsheet.kicad_sch b/qa/data/eeschema/netlists/top_level_hier_pins/subsheet.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/top_level_hier_pins/subsheet.kicad_sch
rename to qa/data/eeschema/netlists/top_level_hier_pins/subsheet.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/top_level_hier_pins/subsubsheet.kicad_sch b/qa/data/eeschema/netlists/top_level_hier_pins/subsubsheet.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/top_level_hier_pins/subsubsheet.kicad_sch
rename to qa/data/eeschema/netlists/top_level_hier_pins/subsubsheet.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/top_level_hier_pins/top_level_hier_pins.kicad_pro b/qa/data/eeschema/netlists/top_level_hier_pins/top_level_hier_pins.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/top_level_hier_pins/top_level_hier_pins.kicad_pro
rename to qa/data/eeschema/netlists/top_level_hier_pins/top_level_hier_pins.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/top_level_hier_pins/top_level_hier_pins.kicad_sch b/qa/data/eeschema/netlists/top_level_hier_pins/top_level_hier_pins.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/top_level_hier_pins/top_level_hier_pins.kicad_sch
rename to qa/data/eeschema/netlists/top_level_hier_pins/top_level_hier_pins.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/top_level_hier_pins/top_level_hier_pins.net b/qa/data/eeschema/netlists/top_level_hier_pins/top_level_hier_pins.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/top_level_hier_pins/top_level_hier_pins.net
rename to qa/data/eeschema/netlists/top_level_hier_pins/top_level_hier_pins.net
diff --git a/qa/unittests/eeschema/data/netlists/video/bus_pci.kicad_sch b/qa/data/eeschema/netlists/video/bus_pci.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/bus_pci.kicad_sch
rename to qa/data/eeschema/netlists/video/bus_pci.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/esvideo.kicad_sch b/qa/data/eeschema/netlists/video/esvideo.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/esvideo.kicad_sch
rename to qa/data/eeschema/netlists/video/esvideo.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/graphic.kicad_sch b/qa/data/eeschema/netlists/video/graphic.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/graphic.kicad_sch
rename to qa/data/eeschema/netlists/video/graphic.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/modul.kicad_sch b/qa/data/eeschema/netlists/video/modul.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/modul.kicad_sch
rename to qa/data/eeschema/netlists/video/modul.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/muxdata.kicad_sch b/qa/data/eeschema/netlists/video/muxdata.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/muxdata.kicad_sch
rename to qa/data/eeschema/netlists/video/muxdata.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/pal-ntsc.kicad_sch b/qa/data/eeschema/netlists/video/pal-ntsc.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/pal-ntsc.kicad_sch
rename to qa/data/eeschema/netlists/video/pal-ntsc.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/rams.kicad_sch b/qa/data/eeschema/netlists/video/rams.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/rams.kicad_sch
rename to qa/data/eeschema/netlists/video/rams.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/video.kicad_pro b/qa/data/eeschema/netlists/video/video.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/video.kicad_pro
rename to qa/data/eeschema/netlists/video/video.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/video/video.kicad_sch b/qa/data/eeschema/netlists/video/video.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/video.kicad_sch
rename to qa/data/eeschema/netlists/video/video.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/video/video.net b/qa/data/eeschema/netlists/video/video.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/video.net
rename to qa/data/eeschema/netlists/video/video.net
diff --git a/qa/unittests/eeschema/data/netlists/video/video.pro b/qa/data/eeschema/netlists/video/video.pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/video/video.pro
rename to qa/data/eeschema/netlists/video/video.pro
diff --git a/qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/merge.kicad_sch b/qa/data/eeschema/netlists/weak_vector_bus_disambiguation/merge.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/merge.kicad_sch
rename to qa/data/eeschema/netlists/weak_vector_bus_disambiguation/merge.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/sub1.kicad_sch b/qa/data/eeschema/netlists/weak_vector_bus_disambiguation/sub1.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/sub1.kicad_sch
rename to qa/data/eeschema/netlists/weak_vector_bus_disambiguation/sub1.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/sub2.kicad_sch b/qa/data/eeschema/netlists/weak_vector_bus_disambiguation/sub2.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/sub2.kicad_sch
rename to qa/data/eeschema/netlists/weak_vector_bus_disambiguation/sub2.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_pro b/qa/data/eeschema/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_pro
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_pro
rename to qa/data/eeschema/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_pro
diff --git a/qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_sch b/qa/data/eeschema/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_sch
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_sch
rename to qa/data/eeschema/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.kicad_sch
diff --git a/qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.net b/qa/data/eeschema/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.net
similarity index 100%
rename from qa/unittests/eeschema/data/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.net
rename to qa/data/eeschema/netlists/weak_vector_bus_disambiguation/weak_vector_bus_disambiguation.net
diff --git a/qa/unittests/eeschema/CMakeLists.txt b/qa/unittests/eeschema/CMakeLists.txt
index 0694095b2a..6120250845 100644
--- a/qa/unittests/eeschema/CMakeLists.txt
+++ b/qa/unittests/eeschema/CMakeLists.txt
@@ -98,7 +98,7 @@ target_compile_definitions( qa_eeschema
 
 # Pass in the default data location
 set_source_files_properties( eeschema_test_utils.cpp PROPERTIES
-    COMPILE_DEFINITIONS "QA_EESCHEMA_DATA_LOCATION=(\"${CMAKE_CURRENT_SOURCE_DIR}/data\")"
+    COMPILE_DEFINITIONS "QA_EESCHEMA_DATA_LOCATION=(\"${CMAKE_SOURCE_DIR}/qa/data/eeschema\")"
 )
 
 kicad_add_boost_test( qa_eeschema qa_eeschema )
diff --git a/qa/unittests/eeschema/data/fixtures_eagle_plugin.h b/qa/unittests/eeschema/data/fixtures_eagle_plugin.h
deleted file mode 100644
index e69de29bb2..0000000000