diff --git a/test/integration/target-prefixes.network b/tests/integration/target-prefixes.network
similarity index 100%
rename from test/integration/target-prefixes.network
rename to tests/integration/target-prefixes.network
diff --git a/test/integration/targets/prepare_vyos_tests/tasks/main.yaml b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/prepare_vyos_tests/tasks/main.yaml
rename to tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
diff --git a/test/integration/targets/vyos_banner/aliases b/tests/integration/targets/vyos_banner/aliases
similarity index 100%
rename from test/integration/targets/vyos_banner/aliases
rename to tests/integration/targets/vyos_banner/aliases
diff --git a/test/integration/targets/vyos_banner/defaults/main.yaml b/tests/integration/targets/vyos_banner/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_banner/defaults/main.yaml
rename to tests/integration/targets/vyos_banner/defaults/main.yaml
diff --git a/test/integration/targets/vyos_banner/tasks/cli.yaml b/tests/integration/targets/vyos_banner/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_banner/tasks/cli.yaml
rename to tests/integration/targets/vyos_banner/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_banner/tasks/main.yaml b/tests/integration/targets/vyos_banner/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_banner/tasks/main.yaml
rename to tests/integration/targets/vyos_banner/tasks/main.yaml
diff --git a/test/integration/targets/vyos_banner/tests/cli/basic-no-login.yaml b/tests/integration/targets/vyos_banner/tests/cli/basic-no-login.yaml
similarity index 100%
rename from test/integration/targets/vyos_banner/tests/cli/basic-no-login.yaml
rename to tests/integration/targets/vyos_banner/tests/cli/basic-no-login.yaml
diff --git a/test/integration/targets/vyos_banner/tests/cli/basic-post-login.yaml b/tests/integration/targets/vyos_banner/tests/cli/basic-post-login.yaml
similarity index 100%
rename from test/integration/targets/vyos_banner/tests/cli/basic-post-login.yaml
rename to tests/integration/targets/vyos_banner/tests/cli/basic-post-login.yaml
diff --git a/test/integration/targets/vyos_banner/tests/cli/basic-pre-login.yaml b/tests/integration/targets/vyos_banner/tests/cli/basic-pre-login.yaml
similarity index 100%
rename from test/integration/targets/vyos_banner/tests/cli/basic-pre-login.yaml
rename to tests/integration/targets/vyos_banner/tests/cli/basic-pre-login.yaml
diff --git a/test/integration/targets/vyos_command/aliases b/tests/integration/targets/vyos_command/aliases
similarity index 100%
rename from test/integration/targets/vyos_command/aliases
rename to tests/integration/targets/vyos_command/aliases
diff --git a/test/integration/targets/vyos_command/defaults/main.yaml b/tests/integration/targets/vyos_command/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/defaults/main.yaml
rename to tests/integration/targets/vyos_command/defaults/main.yaml
diff --git a/test/integration/targets/vyos_command/tasks/cli.yaml b/tests/integration/targets/vyos_command/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tasks/cli.yaml
rename to tests/integration/targets/vyos_command/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_command/tasks/main.yaml b/tests/integration/targets/vyos_command/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tasks/main.yaml
rename to tests/integration/targets/vyos_command/tasks/main.yaml
diff --git a/test/integration/targets/vyos_command/tests/cli/bad_operator.yaml b/tests/integration/targets/vyos_command/tests/cli/bad_operator.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tests/cli/bad_operator.yaml
rename to tests/integration/targets/vyos_command/tests/cli/bad_operator.yaml
diff --git a/test/integration/targets/vyos_command/tests/cli/cli_command.yaml b/tests/integration/targets/vyos_command/tests/cli/cli_command.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tests/cli/cli_command.yaml
rename to tests/integration/targets/vyos_command/tests/cli/cli_command.yaml
diff --git a/test/integration/targets/vyos_command/tests/cli/contains.yaml b/tests/integration/targets/vyos_command/tests/cli/contains.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tests/cli/contains.yaml
rename to tests/integration/targets/vyos_command/tests/cli/contains.yaml
diff --git a/test/integration/targets/vyos_command/tests/cli/invalid.yaml b/tests/integration/targets/vyos_command/tests/cli/invalid.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tests/cli/invalid.yaml
rename to tests/integration/targets/vyos_command/tests/cli/invalid.yaml
diff --git a/test/integration/targets/vyos_command/tests/cli/output.yaml b/tests/integration/targets/vyos_command/tests/cli/output.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tests/cli/output.yaml
rename to tests/integration/targets/vyos_command/tests/cli/output.yaml
diff --git a/test/integration/targets/vyos_command/tests/cli/timeout.yaml b/tests/integration/targets/vyos_command/tests/cli/timeout.yaml
similarity index 100%
rename from test/integration/targets/vyos_command/tests/cli/timeout.yaml
rename to tests/integration/targets/vyos_command/tests/cli/timeout.yaml
diff --git a/test/integration/targets/vyos_config/aliases b/tests/integration/targets/vyos_config/aliases
similarity index 100%
rename from test/integration/targets/vyos_config/aliases
rename to tests/integration/targets/vyos_config/aliases
diff --git a/test/integration/targets/vyos_config/defaults/main.yaml b/tests/integration/targets/vyos_config/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/defaults/main.yaml
rename to tests/integration/targets/vyos_config/defaults/main.yaml
diff --git a/test/integration/targets/vyos_config/tasks/cli.yaml b/tests/integration/targets/vyos_config/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tasks/cli.yaml
rename to tests/integration/targets/vyos_config/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_config/tasks/cli_config.yaml b/tests/integration/targets/vyos_config/tasks/cli_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tasks/cli_config.yaml
rename to tests/integration/targets/vyos_config/tasks/cli_config.yaml
diff --git a/test/integration/targets/vyos_config/tasks/main.yaml b/tests/integration/targets/vyos_config/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tasks/main.yaml
rename to tests/integration/targets/vyos_config/tasks/main.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli/backup.yaml b/tests/integration/targets/vyos_config/tests/cli/backup.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli/backup.yaml
rename to tests/integration/targets/vyos_config/tests/cli/backup.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli/check_config.yaml b/tests/integration/targets/vyos_config/tests/cli/check_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli/check_config.yaml
rename to tests/integration/targets/vyos_config/tests/cli/check_config.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli/comment.yaml b/tests/integration/targets/vyos_config/tests/cli/comment.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli/comment.yaml
rename to tests/integration/targets/vyos_config/tests/cli/comment.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli/save.yaml b/tests/integration/targets/vyos_config/tests/cli/save.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli/save.yaml
rename to tests/integration/targets/vyos_config/tests/cli/save.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli/simple.yaml b/tests/integration/targets/vyos_config/tests/cli/simple.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli/simple.yaml
rename to tests/integration/targets/vyos_config/tests/cli/simple.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml b/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
rename to tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli_config/cli_basic.yaml b/tests/integration/targets/vyos_config/tests/cli_config/cli_basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli_config/cli_basic.yaml
rename to tests/integration/targets/vyos_config/tests/cli_config/cli_basic.yaml
diff --git a/test/integration/targets/vyos_config/tests/cli_config/cli_comment.yaml b/tests/integration/targets/vyos_config/tests/cli_config/cli_comment.yaml
similarity index 100%
rename from test/integration/targets/vyos_config/tests/cli_config/cli_comment.yaml
rename to tests/integration/targets/vyos_config/tests/cli_config/cli_comment.yaml
diff --git a/test/integration/targets/vyos_facts/aliases b/tests/integration/targets/vyos_facts/aliases
similarity index 100%
rename from test/integration/targets/vyos_facts/aliases
rename to tests/integration/targets/vyos_facts/aliases
diff --git a/test/integration/targets/vyos_facts/defaults/main.yaml b/tests/integration/targets/vyos_facts/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_facts/defaults/main.yaml
rename to tests/integration/targets/vyos_facts/defaults/main.yaml
diff --git a/test/integration/targets/vyos_facts/tasks/cli.yaml b/tests/integration/targets/vyos_facts/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_facts/tasks/cli.yaml
rename to tests/integration/targets/vyos_facts/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_facts/tasks/main.yaml b/tests/integration/targets/vyos_facts/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_facts/tasks/main.yaml
rename to tests/integration/targets/vyos_facts/tasks/main.yaml
diff --git a/test/integration/targets/vyos_facts/tests/cli/basic_facts.yaml b/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
similarity index 100%
rename from test/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
rename to tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
diff --git a/test/integration/targets/vyos_interface/aliases b/tests/integration/targets/vyos_interface/aliases
similarity index 100%
rename from test/integration/targets/vyos_interface/aliases
rename to tests/integration/targets/vyos_interface/aliases
diff --git a/test/integration/targets/vyos_interface/defaults/main.yaml b/tests/integration/targets/vyos_interface/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_interface/defaults/main.yaml
rename to tests/integration/targets/vyos_interface/defaults/main.yaml
diff --git a/test/integration/targets/vyos_interface/tasks/cli.yaml b/tests/integration/targets/vyos_interface/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_interface/tasks/cli.yaml
rename to tests/integration/targets/vyos_interface/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_interface/tasks/main.yaml b/tests/integration/targets/vyos_interface/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_interface/tasks/main.yaml
rename to tests/integration/targets/vyos_interface/tasks/main.yaml
diff --git a/test/integration/targets/vyos_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_interface/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_interface/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_interface/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_interface/tests/cli/intent.yaml b/tests/integration/targets/vyos_interface/tests/cli/intent.yaml
similarity index 100%
rename from test/integration/targets/vyos_interface/tests/cli/intent.yaml
rename to tests/integration/targets/vyos_interface/tests/cli/intent.yaml
diff --git a/test/integration/targets/vyos_interface/tests/cli/net_interface.yaml b/tests/integration/targets/vyos_interface/tests/cli/net_interface.yaml
similarity index 100%
rename from test/integration/targets/vyos_interface/tests/cli/net_interface.yaml
rename to tests/integration/targets/vyos_interface/tests/cli/net_interface.yaml
diff --git a/test/integration/targets/vyos_interfaces/defaults/main.yaml b/tests/integration/targets/vyos_interfaces/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/defaults/main.yaml
rename to tests/integration/targets/vyos_interfaces/defaults/main.yaml
diff --git a/test/integration/targets/vyos_interfaces/meta/main.yaml b/tests/integration/targets/vyos_interfaces/meta/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/meta/main.yaml
rename to tests/integration/targets/vyos_interfaces/meta/main.yaml
diff --git a/test/integration/targets/vyos_interfaces/tasks/cli.yaml b/tests/integration/targets/vyos_interfaces/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tasks/cli.yaml
rename to tests/integration/targets/vyos_interfaces/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_interfaces/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tasks/main.yaml
rename to tests/integration/targets/vyos_interfaces/tasks/main.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/merged.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/vyos_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
rename to tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
diff --git a/test/integration/targets/vyos_interfaces/vars/main.yaml b/tests/integration/targets/vyos_interfaces/vars/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_interfaces/vars/main.yaml
rename to tests/integration/targets/vyos_interfaces/vars/main.yaml
diff --git a/test/integration/targets/vyos_l3_interface/aliases b/tests/integration/targets/vyos_l3_interface/aliases
similarity index 100%
rename from test/integration/targets/vyos_l3_interface/aliases
rename to tests/integration/targets/vyos_l3_interface/aliases
diff --git a/test/integration/targets/vyos_l3_interface/defaults/main.yaml b/tests/integration/targets/vyos_l3_interface/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interface/defaults/main.yaml
rename to tests/integration/targets/vyos_l3_interface/defaults/main.yaml
diff --git a/test/integration/targets/vyos_l3_interface/tasks/cli.yaml b/tests/integration/targets/vyos_l3_interface/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interface/tasks/cli.yaml
rename to tests/integration/targets/vyos_l3_interface/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_l3_interface/tasks/main.yaml b/tests/integration/targets/vyos_l3_interface/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interface/tasks/main.yaml
rename to tests/integration/targets/vyos_l3_interface/tasks/main.yaml
diff --git a/test/integration/targets/vyos_l3_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/defaults/main.yaml b/tests/integration/targets/vyos_l3_interfaces/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/defaults/main.yaml
rename to tests/integration/targets/vyos_l3_interfaces/defaults/main.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/meta/main.yml b/tests/integration/targets/vyos_l3_interfaces/meta/main.yml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/meta/main.yml
rename to tests/integration/targets/vyos_l3_interfaces/meta/main.yml
diff --git a/test/integration/targets/vyos_l3_interfaces/tasks/cli.yaml b/tests/integration/targets/vyos_l3_interfaces/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tasks/cli.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tasks/main.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tests/cli/_remove_config.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
rename to tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/vyos_l3_interfaces/vars/main.yaml b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_l3_interfaces/vars/main.yaml
rename to tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/defaults/main.yaml b/tests/integration/targets/vyos_lag_interfaces/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/defaults/main.yaml
rename to tests/integration/targets/vyos_lag_interfaces/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/meta/main.yaml b/tests/integration/targets/vyos_lag_interfaces/meta/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/meta/main.yaml
rename to tests/integration/targets/vyos_lag_interfaces/meta/main.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tasks/cli.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tasks/cli.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tasks/main.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
rename to tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
diff --git a/test/integration/targets/vyos_lag_interfaces/vars/main.yaml b/tests/integration/targets/vyos_lag_interfaces/vars/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lag_interfaces/vars/main.yaml
rename to tests/integration/targets/vyos_lag_interfaces/vars/main.yaml
diff --git a/test/integration/targets/vyos_linkagg/aliases b/tests/integration/targets/vyos_linkagg/aliases
similarity index 100%
rename from test/integration/targets/vyos_linkagg/aliases
rename to tests/integration/targets/vyos_linkagg/aliases
diff --git a/test/integration/targets/vyos_linkagg/defaults/main.yaml b/tests/integration/targets/vyos_linkagg/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_linkagg/defaults/main.yaml
rename to tests/integration/targets/vyos_linkagg/defaults/main.yaml
diff --git a/test/integration/targets/vyos_linkagg/tasks/cli.yaml b/tests/integration/targets/vyos_linkagg/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_linkagg/tasks/cli.yaml
rename to tests/integration/targets/vyos_linkagg/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_linkagg/tasks/main.yaml b/tests/integration/targets/vyos_linkagg/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_linkagg/tasks/main.yaml
rename to tests/integration/targets/vyos_linkagg/tasks/main.yaml
diff --git a/test/integration/targets/vyos_linkagg/tests/cli/basic.yaml b/tests/integration/targets/vyos_linkagg/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_linkagg/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_linkagg/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_linkagg/tests/cli/net_linkagg.yaml b/tests/integration/targets/vyos_linkagg/tests/cli/net_linkagg.yaml
similarity index 100%
rename from test/integration/targets/vyos_linkagg/tests/cli/net_linkagg.yaml
rename to tests/integration/targets/vyos_linkagg/tests/cli/net_linkagg.yaml
diff --git a/test/integration/targets/vyos_lldp/aliases b/tests/integration/targets/vyos_lldp/aliases
similarity index 100%
rename from test/integration/targets/vyos_lldp/aliases
rename to tests/integration/targets/vyos_lldp/aliases
diff --git a/test/integration/targets/vyos_lldp/defaults/main.yaml b/tests/integration/targets/vyos_lldp/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp/defaults/main.yaml
rename to tests/integration/targets/vyos_lldp/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lldp/tasks/cli.yaml b/tests/integration/targets/vyos_lldp/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp/tasks/cli.yaml
rename to tests/integration/targets/vyos_lldp/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lldp/tasks/main.yaml b/tests/integration/targets/vyos_lldp/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp/tasks/main.yaml
rename to tests/integration/targets/vyos_lldp/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lldp/tests/cli/basic.yaml b/tests/integration/targets/vyos_lldp/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_lldp/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_lldp/tests/cli/net_lldp.yaml b/tests/integration/targets/vyos_lldp/tests/cli/net_lldp.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp/tests/cli/net_lldp.yaml
rename to tests/integration/targets/vyos_lldp/tests/cli/net_lldp.yaml
diff --git a/test/integration/targets/vyos_lldp_global/defaults/main.yaml b/tests/integration/targets/vyos_lldp_global/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/defaults/main.yaml
rename to tests/integration/targets/vyos_lldp_global/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tasks/cli.yaml b/tests/integration/targets/vyos_lldp_global/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tasks/cli.yaml
rename to tests/integration/targets/vyos_lldp_global/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tasks/main.yaml b/tests/integration/targets/vyos_lldp_global/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tasks/main.yaml
rename to tests/integration/targets/vyos_lldp_global/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml
rename to tests/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/_remove_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tests/cli/_remove_config.yaml
rename to tests/integration/targets/vyos_lldp_global/tests/cli/_remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
rename to tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tests/cli/merged.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
rename to tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
rename to tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
diff --git a/test/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
rename to tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
diff --git a/test/integration/targets/vyos_lldp_global/vars/main.yaml b/tests/integration/targets/vyos_lldp_global/vars/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_global/vars/main.yaml
rename to tests/integration/targets/vyos_lldp_global/vars/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/aliases b/tests/integration/targets/vyos_lldp_interface/aliases
similarity index 100%
rename from test/integration/targets/vyos_lldp_interface/aliases
rename to tests/integration/targets/vyos_lldp_interface/aliases
diff --git a/test/integration/targets/vyos_lldp_interface/defaults/main.yaml b/tests/integration/targets/vyos_lldp_interface/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interface/defaults/main.yaml
rename to tests/integration/targets/vyos_lldp_interface/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/tasks/cli.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interface/tasks/cli.yaml
rename to tests/integration/targets/vyos_lldp_interface/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interface/tasks/main.yaml
rename to tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml b/tests/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
rename to tests/integration/targets/vyos_lldp_interface/tests/cli/net_lldp_interface.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/defaults/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/meta/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/meta/main.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/vars/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_lldp_interfaces/vars/main.yaml
rename to tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
diff --git a/test/integration/targets/vyos_logging/aliases b/tests/integration/targets/vyos_logging/aliases
similarity index 100%
rename from test/integration/targets/vyos_logging/aliases
rename to tests/integration/targets/vyos_logging/aliases
diff --git a/test/integration/targets/vyos_logging/defaults/main.yaml b/tests/integration/targets/vyos_logging/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_logging/defaults/main.yaml
rename to tests/integration/targets/vyos_logging/defaults/main.yaml
diff --git a/test/integration/targets/vyos_logging/tasks/cli.yaml b/tests/integration/targets/vyos_logging/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_logging/tasks/cli.yaml
rename to tests/integration/targets/vyos_logging/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_logging/tasks/main.yaml b/tests/integration/targets/vyos_logging/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_logging/tasks/main.yaml
rename to tests/integration/targets/vyos_logging/tasks/main.yaml
diff --git a/test/integration/targets/vyos_logging/tests/cli/basic.yaml b/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_logging/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_logging/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_logging/tests/cli/net_logging.yaml b/tests/integration/targets/vyos_logging/tests/cli/net_logging.yaml
similarity index 100%
rename from test/integration/targets/vyos_logging/tests/cli/net_logging.yaml
rename to tests/integration/targets/vyos_logging/tests/cli/net_logging.yaml
diff --git a/test/integration/targets/vyos_smoke/defaults/main.yaml b/tests/integration/targets/vyos_smoke/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_smoke/defaults/main.yaml
rename to tests/integration/targets/vyos_smoke/defaults/main.yaml
diff --git a/test/integration/targets/vyos_smoke/tasks/cli.yaml b/tests/integration/targets/vyos_smoke/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_smoke/tasks/cli.yaml
rename to tests/integration/targets/vyos_smoke/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_smoke/tasks/main.yaml b/tests/integration/targets/vyos_smoke/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_smoke/tasks/main.yaml
rename to tests/integration/targets/vyos_smoke/tasks/main.yaml
diff --git a/test/integration/targets/vyos_smoke/tests/cli/common_config.yaml b/tests/integration/targets/vyos_smoke/tests/cli/common_config.yaml
similarity index 100%
rename from test/integration/targets/vyos_smoke/tests/cli/common_config.yaml
rename to tests/integration/targets/vyos_smoke/tests/cli/common_config.yaml
diff --git a/test/integration/targets/vyos_smoke/tests/cli/common_utils.yaml b/tests/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
similarity index 100%
rename from test/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
rename to tests/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
diff --git a/test/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml b/tests/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
similarity index 100%
rename from test/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
rename to tests/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
diff --git a/test/integration/targets/vyos_static_route/aliases b/tests/integration/targets/vyos_static_route/aliases
similarity index 100%
rename from test/integration/targets/vyos_static_route/aliases
rename to tests/integration/targets/vyos_static_route/aliases
diff --git a/test/integration/targets/vyos_static_route/defaults/main.yaml b/tests/integration/targets/vyos_static_route/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_static_route/defaults/main.yaml
rename to tests/integration/targets/vyos_static_route/defaults/main.yaml
diff --git a/test/integration/targets/vyos_static_route/tasks/cli.yaml b/tests/integration/targets/vyos_static_route/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_static_route/tasks/cli.yaml
rename to tests/integration/targets/vyos_static_route/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_static_route/tasks/main.yaml b/tests/integration/targets/vyos_static_route/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_static_route/tasks/main.yaml
rename to tests/integration/targets/vyos_static_route/tasks/main.yaml
diff --git a/test/integration/targets/vyos_static_route/tests/cli/basic.yaml b/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_static_route/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml b/tests/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
similarity index 100%
rename from test/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
rename to tests/integration/targets/vyos_static_route/tests/cli/net_static_route.yaml
diff --git a/test/integration/targets/vyos_system/defaults/main.yaml b/tests/integration/targets/vyos_system/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_system/defaults/main.yaml
rename to tests/integration/targets/vyos_system/defaults/main.yaml
diff --git a/test/integration/targets/vyos_system/tasks/cli.yaml b/tests/integration/targets/vyos_system/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_system/tasks/cli.yaml
rename to tests/integration/targets/vyos_system/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_system/tasks/main.yaml b/tests/integration/targets/vyos_system/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_system/tasks/main.yaml
rename to tests/integration/targets/vyos_system/tasks/main.yaml
diff --git a/test/integration/targets/vyos_system/tests/cli/basic.yaml b/tests/integration/targets/vyos_system/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_system/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_system/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_system/tests/cli/net_system.yaml b/tests/integration/targets/vyos_system/tests/cli/net_system.yaml
similarity index 100%
rename from test/integration/targets/vyos_system/tests/cli/net_system.yaml
rename to tests/integration/targets/vyos_system/tests/cli/net_system.yaml
diff --git a/test/integration/targets/vyos_user/aliases b/tests/integration/targets/vyos_user/aliases
similarity index 100%
rename from test/integration/targets/vyos_user/aliases
rename to tests/integration/targets/vyos_user/aliases
diff --git a/test/integration/targets/vyos_user/defaults/main.yaml b/tests/integration/targets/vyos_user/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_user/defaults/main.yaml
rename to tests/integration/targets/vyos_user/defaults/main.yaml
diff --git a/test/integration/targets/vyos_user/tasks/cli.yaml b/tests/integration/targets/vyos_user/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_user/tasks/cli.yaml
rename to tests/integration/targets/vyos_user/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_user/tasks/main.yaml b/tests/integration/targets/vyos_user/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_user/tasks/main.yaml
rename to tests/integration/targets/vyos_user/tasks/main.yaml
diff --git a/test/integration/targets/vyos_user/tests/cli/auth.yaml b/tests/integration/targets/vyos_user/tests/cli/auth.yaml
similarity index 100%
rename from test/integration/targets/vyos_user/tests/cli/auth.yaml
rename to tests/integration/targets/vyos_user/tests/cli/auth.yaml
diff --git a/test/integration/targets/vyos_user/tests/cli/basic.yaml b/tests/integration/targets/vyos_user/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_user/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_user/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_vlan/aliases b/tests/integration/targets/vyos_vlan/aliases
similarity index 100%
rename from test/integration/targets/vyos_vlan/aliases
rename to tests/integration/targets/vyos_vlan/aliases
diff --git a/test/integration/targets/vyos_vlan/defaults/main.yaml b/tests/integration/targets/vyos_vlan/defaults/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_vlan/defaults/main.yaml
rename to tests/integration/targets/vyos_vlan/defaults/main.yaml
diff --git a/test/integration/targets/vyos_vlan/tasks/cli.yaml b/tests/integration/targets/vyos_vlan/tasks/cli.yaml
similarity index 100%
rename from test/integration/targets/vyos_vlan/tasks/cli.yaml
rename to tests/integration/targets/vyos_vlan/tasks/cli.yaml
diff --git a/test/integration/targets/vyos_vlan/tasks/main.yaml b/tests/integration/targets/vyos_vlan/tasks/main.yaml
similarity index 100%
rename from test/integration/targets/vyos_vlan/tasks/main.yaml
rename to tests/integration/targets/vyos_vlan/tasks/main.yaml
diff --git a/test/integration/targets/vyos_vlan/tests/cli/basic.yaml b/tests/integration/targets/vyos_vlan/tests/cli/basic.yaml
similarity index 100%
rename from test/integration/targets/vyos_vlan/tests/cli/basic.yaml
rename to tests/integration/targets/vyos_vlan/tests/cli/basic.yaml
diff --git a/test/integration/targets/vyos_vlan/tests/cli/intent.yaml b/tests/integration/targets/vyos_vlan/tests/cli/intent.yaml
similarity index 100%
rename from test/integration/targets/vyos_vlan/tests/cli/intent.yaml
rename to tests/integration/targets/vyos_vlan/tests/cli/intent.yaml
diff --git a/test/integration/targets/vyos_vlan/tests/cli/multiple.yaml b/tests/integration/targets/vyos_vlan/tests/cli/multiple.yaml
similarity index 100%
rename from test/integration/targets/vyos_vlan/tests/cli/multiple.yaml
rename to tests/integration/targets/vyos_vlan/tests/cli/multiple.yaml