diff --git a/spec/factories/surveys.rb b/spec/factories/surveys.rb
index cf44f7ed..c95a9d27 100644
--- a/spec/factories/surveys.rb
+++ b/spec/factories/surveys.rb
@@ -3,8 +3,6 @@
 FactoryBot.define do
   factory :survey do
     title { 'This is my survey' }
-    start_date { Date.current - 1.day }
-    end_date { Date.current + 1.day }
 
     factory :conference_survey do
       association :surveyable, factory: :conference
diff --git a/spec/features/surveys_spec.rb b/spec/features/surveys_spec.rb
new file mode 100644
index 00000000..927c23fc
--- /dev/null
+++ b/spec/features/surveys_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+feature Survey do
+  let(:conference) { create(:conference) }
+
+  context 'as an organizer' do
+    let(:organizer) { create(:organizer, resource: conference) }
+
+    before :each do
+      sign_in organizer
+    end
+
+    scenario 'create a survey', feature: true, js: true do
+      visit admin_conference_path(conference)
+      click_link 'Surveys'
+      click_link 'New'
+      fill_in 'Title', with: 'Example Survey'
+      click_button 'Create Survey'
+      expect(flash).to eq('Successfully created survey')
+
+      fill_in :survey_question_title, with: 'Example question'
+      select 'boolean', from: 'Type of Question:', visible: false # Hidden by bootstrap-select
+      click_button 'Create Survey question'
+      expect(flash).to eq('Successfully created Survey Question.')
+    end
+  end
+
+  context 'as an attendee' do
+    let(:attendee) { create(:user) }
+
+    before :each do
+      sign_in attendee
+    end
+
+    scenario 'respond to a survey during registration', feature: true, js: true do
+      create :registration_period, conference: conference
+      create :registration, conference: conference, user: attendee
+      survey = create(:survey, surveyable: conference, target: :during_registration)
+      create :boolean_mandatory, survey: survey
+
+      visit conference_conference_registration_path(conference)
+      expect(find(:link, survey.title).sibling('.fa')[:title]).to eq('Please fill out the survey')
+
+      click_link survey.title
+      choose 'Yes'
+      click_button 'Submit'
+      expect(flash).to eq('Successfully responded to survey.')
+
+      visit conference_conference_registration_path(conference)
+      expect(find(:link, survey.title).sibling('.fa')[:title]).to eq('Thank you for filling out the survey')
+    end
+  end
+end