diff --git a/audio/tests/test_new_episode_view.py b/audio/tests/test_new_episode_view.py
new file mode 100644
index 0000000..8373d55
--- /dev/null
+++ b/audio/tests/test_new_episode_view.py
@@ -0,0 +1,97 @@
+from django.test import TestCase
+from audio.tests.test_views import set_up
+from audio.models import Episode, Feed
+from django.urls import reverse
+from datetime import date
+
+
+class TestNewEpisodeViewTestCase(TestCase):
+
+    def setUp(self):
+        set_up()
+
+    def test_new_episode_view_no_data(self):
+        feed_a = Feed.objects.get(title="Short Stories Mark Twain")
+        self.client.login(username='user_b', password='password_user_b')
+        kw_args = {'feed_pk': feed_a.pk, 'feed_title_slug': feed_a.slug}
+        response = self.client.post(reverse('audio:new_episode', kwargs=kw_args))
+        self.assertTemplateUsed(response, 'base_form.html')
+        self.assertEquals(response.status_code, 200)
+        qs = Episode.objects.filter(title="Mark Twain Taming The Bicycle")
+        self.assertEquals(len(qs), 0)
+
+    def test_new_episode_view_no_login(self):
+        feed_a = Feed.objects.get(title="Short Stories Mark Twain")
+        kw_args = {'feed_pk': feed_a.pk, 'feed_title_slug': feed_a.slug}
+        pub_date = str(date.today())
+        with (
+                open('bicycle.jpg', 'rb') as image_f,
+                open('Mark Twain Taming The Bicycle.mp3', 'rb') as mp3_f
+        ):
+            response = self.client.post(reverse('audio:new_episode', kwargs=kw_args), {
+                'title': "Mark Twain Taming The Bicycle",
+                'author': "Mark Twain",
+                'pub_date': pub_date,
+                'episode_number': 3,
+                'description': 'learn how to ride a bicycle',
+                'mp3': mp3_f,
+                'image_title': 'A Penny Farthing',
+                'image_attribution': 'Agnieszka Kwiecień',
+                'image_attribution_url': 'https://commons.wikimedia.org/wiki/User:Nova',
+                'original_image_url': 'https://commons.wikimedia.org/wiki/File:Ordinary_bicycle01.jpg',
+                'image_license': 1,
+                'image_license_jurisdiction': 'in the USA',
+                'image': image_f,
+            }, follow=True)
+        self.assertTemplateUsed(response, 'audio/index.html')
+        self.assertEquals(response.status_code, 200)
+        qs = Episode.objects.filter(title="Mark Twain Taming The Bicycle")
+        self.assertEquals(len(qs), 0)
+
+    def test_new_episode_view(self):
+        feed_a = Feed.objects.get(title="Short Stories Mark Twain")
+        self.client.login(username='user_b', password='password_user_b')
+        kw_args = {'feed_pk': feed_a.pk, 'feed_title_slug': feed_a.slug}
+        pub_date = str(date.today())
+        with (
+                open('bicycle.jpg', 'rb') as image_f,
+                open('Mark Twain Taming The Bicycle.mp3', 'rb') as mp3_f
+        ):
+            response = self.client.post(reverse('audio:new_episode', kwargs=kw_args), {
+                'title': "Mark Twain Taming The Bicycle",
+                'author': "Mark Twain",
+                'pub_date': pub_date,
+                'episode_number': 3,
+                'description': 'learn how to ride a bicycle',
+                'mp3': mp3_f,
+                'image_title': 'A Penny Farthing',
+                'image_attribution': 'Agnieszka Kwiecień',
+                'image_attribution_url': 'https://commons.wikimedia.org/wiki/User:Nova',
+                'original_image_url': 'https://commons.wikimedia.org/wiki/File:Ordinary_bicycle01.jpg',
+                'image_license': 1,
+                'image_license_jurisdiction': 'in the USA',
+                'image': image_f,
+            })
+        self.assertEquals(response.status_code, 302)
+        episode_a = Episode.objects.get(title="Mark Twain Taming The Bicycle")
+        self.assertEquals(episode_a.author, "Mark Twain")
+        self.assertEquals(str(episode_a.pub_date), pub_date)
+        self.assertEquals(episode_a.episode_number, 3)
+        self.assertEquals(episode_a.description, 'learn how to ride a bicycle')
+        self.assertEquals(episode_a.mp3, 'mark-twain-taming-the-bicycle.mp3')
+        self.assertEquals(episode_a.image_title, 'A Penny Farthing')
+        self.assertEquals(episode_a.image_attribution, 'Agnieszka Kwiecień')
+        self.assertEquals(
+            episode_a.image_attribution_url, 'https://commons.wikimedia.org/wiki/User:Nova'
+        )
+        self.assertEquals(
+            episode_a.original_image_url,
+            'https://commons.wikimedia.org/wiki/File:Ordinary_bicycle01.jpg'
+        )
+        self.assertEquals(episode_a.image_license, 1)
+        self.assertEquals(episode_a.image_license_jurisdiction, 'in the USA')
+        self.assertEquals(episode_a.image, 'bicycle.jpg')
+        self.assertEquals(episode_a.image_license_name, 'Public Domain')
+        self.assertEquals(
+            episode_a.image_license_url, 'https://en.wikipedia.org/wiki/Public_domain'
+        )