diff --git a/.travis.yml b/.travis.yml
index f26e70f..d9282d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ if: type != push OR (tag IS blank AND branch = master)
 
 before_script:
  - if [[ "$TRAVIS_BUILD_STAGE_NAME" == "Integration" || "$TRAVIS_BUILD_STAGE_NAME" == "Coverage" ]]; then
-     docker pull greenmail/standalone:1.5.8 &&
-     docker run -d -e GREENMAIL_OPTS='-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose' -p 3025:3025 -p 3110:3110 -p 3143:3143 -p 3465:3465 -p 3993:3993 -p 3995:3995 greenmail/standalone:1.5.8;
+     docker pull greenmail/standalone:1.5.9 &&
+     docker run -d -e GREENMAIL_OPTS='-Dgreenmail.setup.test.all -Dgreenmail.hostname=0.0.0.0 -Dgreenmail.auth.disabled -Dgreenmail.verbose' -p 3025:3025 -p 3110:3110 -p 3143:3143 -p 3465:3465 -p 3993:3993 -p 3995:3995 greenmail/standalone:1.5.9;
    fi
 
 # an entry in stage=test will be generated for each rust/os combination.
diff --git a/tests/imap_integration.rs b/tests/imap_integration.rs
index a61c52c..f057ab4 100644
--- a/tests/imap_integration.rs
+++ b/tests/imap_integration.rs
@@ -70,7 +70,7 @@ fn logout() {
 #[test]
 #[ignore]
 fn inbox_zero() {
-    // https://github.com/djc/tokio-imap/issues/34
+    // https://github.com/greenmail-mail-test/greenmail/issues/265
     let mut s = session("readonly-test@localhost");
     s.select("INBOX").unwrap();
     let inbox = s.search("ALL").unwrap();
@@ -141,9 +141,8 @@ fn inbox() {
     c.expunge().unwrap();
 
     // the e-mail should be gone now
-    // TODO: https://github.com/djc/tokio-imap/issues/34
-    // let inbox = c.search("ALL").unwrap();
-    // assert_eq!(inbox.len(), 0);
+    let inbox = c.search("ALL").unwrap();
+    assert_eq!(inbox.len(), 0);
 }
 
 #[test]
@@ -199,9 +198,8 @@ fn inbox_uid() {
     c.expunge().unwrap();
 
     // the e-mail should be gone now
-    // TODO: https://github.com/djc/tokio-imap/issues/34
-    // let inbox = c.search("ALL").unwrap();
-    // assert_eq!(inbox.len(), 0);
+    let inbox = c.search("ALL").unwrap();
+    assert_eq!(inbox.len(), 0);
 }
 
 #[test]