diff --git a/tests/e2e/plugins/internal/__init__.py b/tests/e2e/cli/__init__.py
similarity index 100%
rename from tests/e2e/plugins/internal/__init__.py
rename to tests/e2e/cli/__init__.py
diff --git a/tests/e2e/plugins/internal/test_view.py b/tests/e2e/cli/test_view.py
similarity index 90%
rename from tests/e2e/plugins/internal/test_view.py
rename to tests/e2e/cli/test_view.py
index 88951250..19a8e289 100644
--- a/tests/e2e/plugins/internal/test_view.py
+++ b/tests/e2e/cli/test_view.py
@@ -2,10 +2,12 @@ from typing import Optional
 
 import pytest
 from conftest import mock_run_from_cli
+from resources import DISABLE_YOUTUBE_TESTS
 
 from ytdl_sub.utils.file_handler import FileMetadata
 
 
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestView:
     @pytest.mark.parametrize("split_chapters", [True, False])
     def test_view_from_cli(
diff --git a/tests/e2e/plugins/test_audio_extract.py b/tests/e2e/plugins/test_audio_extract.py
index 4b3a6e2e..347dead7 100644
--- a/tests/e2e/plugins/test_audio_extract.py
+++ b/tests/e2e/plugins/test_audio_extract.py
@@ -46,9 +46,8 @@ def youtube_release_preset_dict(output_directory):
         },
     }
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestAudioExtract:
     @pytest.mark.parametrize("dry_run", [False])
     def test_audio_extract_single_song(
diff --git a/tests/e2e/plugins/test_chapters.py b/tests/e2e/plugins/test_chapters.py
index 45f427b7..7604a162 100644
--- a/tests/e2e/plugins/test_chapters.py
+++ b/tests/e2e/plugins/test_chapters.py
@@ -54,9 +54,7 @@ def chapters_from_comments_preset_dict(sponsorblock_and_subs_preset_dict: Dict)
     return sponsorblock_and_subs_preset_dict
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestChapters:
     @pytest.mark.parametrize("dry_run", [True, False])
     def test_chapters_sponsorblock_and_removal_with_subs(
diff --git a/tests/e2e/plugins/test_date_range.py b/tests/e2e/plugins/test_date_range.py
index 139cdd79..a4ec0f41 100644
--- a/tests/e2e/plugins/test_date_range.py
+++ b/tests/e2e/plugins/test_date_range.py
@@ -39,9 +39,7 @@ def rolling_recent_channel_preset_dict(recent_preset_dict):
     )
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestDateRange:
     @pytest.mark.parametrize("dry_run", [True, False])
     @pytest.mark.parametrize("date_range_breaks", [True, False])
diff --git a/tests/e2e/plugins/test_file_convert.py b/tests/e2e/plugins/test_file_convert.py
index e4d711fa..6a9013db 100644
--- a/tests/e2e/plugins/test_file_convert.py
+++ b/tests/e2e/plugins/test_file_convert.py
@@ -20,9 +20,7 @@ def preset_dict(output_directory):
     }
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestFileConvert:
     @pytest.mark.parametrize("dry_run", [True, False])
     def test_file_convert(
diff --git a/tests/e2e/plugins/test_match_filters.py b/tests/e2e/plugins/test_match_filters.py
index 4ea43aea..6a65ee9b 100644
--- a/tests/e2e/plugins/test_match_filters.py
+++ b/tests/e2e/plugins/test_match_filters.py
@@ -46,9 +46,7 @@ def livestream_preset_dict(output_directory):
     }
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestFileConvert:
     def test_livestreams_download_filtered(
         self,
diff --git a/tests/e2e/plugins/test_split_by_chapters.py b/tests/e2e/plugins/test_split_by_chapters.py
index 33f84614..ffffb7b4 100644
--- a/tests/e2e/plugins/test_split_by_chapters.py
+++ b/tests/e2e/plugins/test_split_by_chapters.py
@@ -58,9 +58,7 @@ def yt_album_as_chapters_with_regex_preset_dict(yt_album_as_chapters_preset_dict
     return yt_album_as_chapters_preset_dict
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestSplitByChapters:
     @pytest.mark.parametrize("dry_run", [True, False])
     def test_video_with_chapters(
diff --git a/tests/e2e/plugins/test_subtitles.py b/tests/e2e/plugins/test_subtitles.py
index fd82112b..bead12b1 100644
--- a/tests/e2e/plugins/test_subtitles.py
+++ b/tests/e2e/plugins/test_subtitles.py
@@ -32,9 +32,7 @@ def test_single_video_subs_embed_and_file_preset_dict(single_video_subs_embed_pr
     return single_video_subs_embed_preset_dict
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestSubtitles:
     def test_subtitle_lang_variable_partial_validates(self, default_config):
         default_config_dict = default_config.as_dict()
diff --git a/tests/e2e/presets/test_bilateral.py b/tests/e2e/presets/test_bilateral.py
index b5e7c02f..8b83e83b 100644
--- a/tests/e2e/presets/test_bilateral.py
+++ b/tests/e2e/presets/test_bilateral.py
@@ -51,9 +51,7 @@ def tv_show_collection_bilateral_dict(output_directory):
     }
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestBilateral:
 
     def test_tv_show_by_date_downloads_bilateral(
diff --git a/tests/e2e/youtube/test_channel.py b/tests/e2e/youtube/test_channel.py
index 02c103ff..7ef62d09 100644
--- a/tests/e2e/youtube/test_channel.py
+++ b/tests/e2e/youtube/test_channel.py
@@ -43,9 +43,7 @@ def channel_preset_dict(output_directory):
     }
 
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestChannel:
     """
     Downloads my old minecraft youtube channel. Ensure the above files exist and have the
diff --git a/tests/e2e/youtube/test_video.py b/tests/e2e/youtube/test_video.py
index 2964f95b..30cbe186 100644
--- a/tests/e2e/youtube/test_video.py
+++ b/tests/e2e/youtube/test_video.py
@@ -29,9 +29,8 @@ def single_video_preset_dict(output_directory):
         },
     }
 
-@pytest.mark.skipif(
-    DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH"
-)
+
+@pytest.mark.skipif(DISABLE_YOUTUBE_TESTS, reason="YouTube tests cannot run in GH")
 class TestYoutubeVideo:
     @pytest.mark.parametrize("dry_run", [True, False])
     def test_single_video_download(