diff --git a/test/integration/smtp/client-session.vala b/test/integration/smtp/client-session.vala
new file mode 100644
index 00000000..0c869a27
--- /dev/null
+++ b/test/integration/smtp/client-session.vala
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2019 Michael Gratton <mike@vee.net>
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later). See the COPYING file in this distribution.
+ */
+
+class Integration.Smtp.ClientSession : TestCase {
+
+
+    private Configuration config;
+    private Geary.Smtp.ClientSession? session;
+
+
+    public ClientSession(Configuration config) {
+        base("Integration.Smtp.ClientSession");
+        this.config = config;
+
+        // Break out connecting
+        //add_test("session_connect", session_connect);
+
+        add_test("login_password_invalid", login_password_invalid);
+        if (config.provider == GMAIL ||
+            config.provider == OUTLOOK) {
+            add_test("login_oauth2_invalid", login_oauth2_invalid);
+        }
+
+        add_test("initiate_session", initiate_session);
+        add_test("send_basic_email", send_basic_email);
+    }
+
+    public override void set_up() {
+        this.session = new Geary.Smtp.ClientSession(
+            this.config.target
+        );
+    }
+
+    public override void tear_down() throws GLib.Error {
+        try {
+            this.session.logout_async.begin(false, null, async_complete_full);
+            this.session.logout_async.end(async_result());
+        } catch (GLib.Error err) {
+            // Oh well
+        }
+        this.session = null;
+    }
+
+    public void login_password_invalid() throws GLib.Error {
+        Geary.Credentials password_creds = new Geary.Credentials(
+            PASSWORD,
+            "automated-integration-test",
+            "deliberately-invalid-password"
+        );
+        this.session.login_async.begin(
+            password_creds, null, async_complete_full
+        );
+        try {
+            this.session.login_async.end(async_result());
+            assert_not_reached();
+        } catch (Geary.SmtpError.AUTHENTICATION_FAILED err) {
+            // All good
+        }
+    }
+
+    public void login_oauth2_invalid() throws GLib.Error {
+        Geary.Credentials oauth2_creds = new Geary.Credentials(
+            OAUTH2,
+            "automated-integration-test",
+            "deliberately-invalid-token"
+        );
+        this.session.login_async.begin(
+            oauth2_creds, null, async_complete_full
+        );
+        try {
+            this.session.login_async.end(async_result());
+            assert_not_reached();
+        } catch (Geary.SmtpError.AUTHENTICATION_FAILED err) {
+            // All good
+        }
+    }
+
+    public void initiate_session() throws GLib.Error {
+        do_connect();
+    }
+
+    public void send_basic_email() throws GLib.Error {
+        do_connect();
+
+        Geary.RFC822.MailboxAddress return_path =
+            new Geary.RFC822.MailboxAddress(
+                null, this.config.credentials.user
+            );
+
+        Geary.RFC822.Message message = new_message(
+            return_path,
+            new Geary.RFC822.MailboxAddress(
+                "Geary integration test",
+                this.config.credentials.user
+            )
+        );
+
+        this.session.send_email_async.begin(
+            return_path,
+            message,
+            null,
+            async_complete_full
+        );
+        this.session.send_email_async.end(async_result());
+    }
+
+    private void do_connect() throws GLib.Error {
+        this.session.login_async.begin(
+            this.config.credentials, null, async_complete_full
+        );
+        this.session.login_async.end(async_result());
+    }
+
+    private Geary.RFC822.Message new_message(Geary.RFC822.MailboxAddress from,
+                                             Geary.RFC822.MailboxAddress to) {
+        Geary.ComposedEmail composed = new Geary.ComposedEmail(
+            new GLib.DateTime.now_local(),
+            new Geary.RFC822.MailboxAddresses.single(from),
+            new Geary.RFC822.MailboxAddresses.single(to),
+            null,
+            null,
+            "Geary integration test subject",
+            "Geary integration test message",
+            null
+        );
+
+        return new Geary.RFC822.Message.from_composed_email(
+            composed,
+            GMime.utils_generate_message_id(from.domain)
+        );
+    }
+
+}
diff --git a/test/meson.build b/test/meson.build
index 4e7fecae..327504b7 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -96,6 +96,7 @@ geary_test_integration_sources = [
   'test-integration.vala',
 
   'integration/imap/client-session.vala',
+  'integration/smtp/client-session.vala',
 ]
 
 # Test library
diff --git a/test/test-integration.vala b/test/test-integration.vala
index 8204275f..02f58ccb 100644
--- a/test/test-integration.vala
+++ b/test/test-integration.vala
@@ -6,7 +6,8 @@
  */
 
 
-private const int TIMEOUT = 5;
+// 5s is too short for some SMTP servers
+private const int TIMEOUT = 10;
 
 
 public struct Integration.Configuration {
@@ -47,6 +48,12 @@ int main(string[] args) {
             new Integration.Imap.ClientSession(config).get_suite()
         );
         break;
+
+    case SMTP:
+        integration.add_suite(
+            new Integration.Smtp.ClientSession(config).get_suite()
+        );
+        break;
     }
 
     /*