diff --git a/tests/interfaces/openlp_plugins_custom_forms/__init__.py b/tests/interfaces/openlp_plugins/__init__.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_custom_forms/__init__.py
rename to tests/interfaces/openlp_plugins/__init__.py
diff --git a/tests/interfaces/openlp_plugins/__init__.pyc b/tests/interfaces/openlp_plugins/__init__.pyc
new file mode 100644
index 000000000..0d24c9eff
Binary files /dev/null and b/tests/interfaces/openlp_plugins/__init__.pyc differ
diff --git a/tests/interfaces/openlp_plugins_songs_forms/__init__.py b/tests/interfaces/openlp_plugins/custom/__init__.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_songs_forms/__init__.py
rename to tests/interfaces/openlp_plugins/custom/__init__.py
diff --git a/tests/interfaces/openlp_plugins/custom/forms/__init__.py b/tests/interfaces/openlp_plugins/custom/forms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/interfaces/openlp_plugins_custom_forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_custom_forms/test_customform.py
rename to tests/interfaces/openlp_plugins/custom/forms/test_customform.py
diff --git a/tests/interfaces/openlp_plugins/songs/__init__.py b/tests/interfaces/openlp_plugins/songs/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/interfaces/openlp_plugins/songs/forms/__init__.py b/tests/interfaces/openlp_plugins/songs/forms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/interfaces/openlp_plugins_songs_forms/test_authorsform.py b/tests/interfaces/openlp_plugins/songs/forms/test_authorsform.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_songs_forms/test_authorsform.py
rename to tests/interfaces/openlp_plugins/songs/forms/test_authorsform.py
diff --git a/tests/interfaces/openlp_plugins_songs_forms/test_editsongform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_songs_forms/test_editsongform.py
rename to tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py
diff --git a/tests/interfaces/openlp_plugins_songs_forms/test_editverseform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_songs_forms/test_editverseform.py
rename to tests/interfaces/openlp_plugins/songs/forms/test_editverseform.py
diff --git a/tests/interfaces/openlp_plugins_songs_forms/test_topicsform.py b/tests/interfaces/openlp_plugins/songs/forms/test_topicsform.py
similarity index 100%
rename from tests/interfaces/openlp_plugins_songs_forms/test_topicsform.py
rename to tests/interfaces/openlp_plugins/songs/forms/test_topicsform.py