diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
new file mode 100644
index 000000000..47cbdd0f2
--- /dev/null
+++ b/test/fixtures/messages.yml
@@ -0,0 +1,4 @@
+greeting:
+  body: Welcome!
+  queued: true
+  registrar: bestnames
diff --git a/test/integration/epp/poll_test.rb b/test/integration/epp/poll_test.rb
new file mode 100644
index 000000000..db6091cb0
--- /dev/null
+++ b/test/integration/epp/poll_test.rb
@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class EppPollTest < ActionDispatch::IntegrationTest
+  def test_messages
+    post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_equal '1301', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('msgQ').size
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
+  end
+
+  def test_no_messages
+    registrars(:bestnames).messages.delete_all(:delete_all)
+    post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    assert_equal '1300', Nokogiri::XML(response.body).at_css('result')[:code]
+    assert_equal 1, Nokogiri::XML(response.body).css('result').size
+  end
+
+  private
+
+  def request_xml
+    <<-XML
+      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
+        <command>
+          <poll op="req"/>
+        </command>
+      </epp>
+    XML
+  end
+end