diff --git a/.travis.yml b/.travis.yml
index c8f9fedb..e50cf05c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
     packages:
       - expect-dev  # provides unbuffer utility
       - python-lxml  # because pip installation is slow
+  postgresql: "9.6"
 
 env:
   global:
diff --git a/mail_sendgrid_mass_mailing/README.rst b/mail_sendgrid_mass_mailing/README.rst
index 4c078672..a6c714e1 100644
--- a/mail_sendgrid_mass_mailing/README.rst
+++ b/mail_sendgrid_mass_mailing/README.rst
@@ -16,6 +16,8 @@ Installation
 This addon will be automatically installed when 'mail_sendgrid' and
 'mass_mailing' are both installed.
 
+Note this module is not compatible with the v6 versions of the sendgrid library.
+
 Configuration
 =============
 None
diff --git a/requirements.txt b/requirements.txt
index 94d9e9ba..2b07b34c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 premailer
-sendgrid
+sendgrid<v6.0.0