diff --git a/.travis.yml b/.travis.yml
index 2f357140..15131119 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,8 +53,6 @@ matrix:
         - libsodium-dev
         - asciidoc
         - xmlto
-  - env: BUILD_TYPE=default CURVE=libsodium
-    os: osx
   - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
     os: linux
     addons:
@@ -64,8 +62,6 @@ matrix:
           key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_14.04/Release.key'
         packages:
         - libsodium-dev
-        - asciidoc
-        - xmlto
   - env: BUILD_TYPE=default CURVE=libsodium DRAFT=enabled
     os: osx
   - env: BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled ADDRESS_SANITIZER=enabled
@@ -82,7 +78,7 @@ matrix:
 sudo: required
 
 before_install:
-- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi
+- if [ $TRAVIS_OS_NAME == "osx" -a $BUILD_TYPE == "android" ] ; then brew install binutils ; fi
 - if [ $TRAVIS_OS_NAME == "osx" -a $CURVE == "libsodium" ] ; then brew install libsodium ; fi
 
 before_script:
diff --git a/tests/test_security_curve.cpp b/tests/test_security_curve.cpp
index f5b49c34..39834bf7 100644
--- a/tests/test_security_curve.cpp
+++ b/tests/test_security_curve.cpp
@@ -479,7 +479,8 @@ void test_curve_security_with_null_client_credentials (void *ctx,
 #endif
 }
 
-void test_curve_security_with_plain_client_credentials (void *ctx, void *server)
+void test_curve_security_with_plain_client_credentials (void *ctx, void *server,
+                                                        char *my_endpoint)
 {
     //  This must be caught by the curve_server class, not passed to ZAP
     void *client = zmq_socket (ctx, ZMQ_DEALER);
@@ -488,7 +489,7 @@ void test_curve_security_with_plain_client_credentials (void *ctx, void *server)
     assert (rc == 0);
     rc = zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8);
     assert (rc == 0);
-    rc = zmq_connect (client, "tcp://localhost:9998");
+    rc = zmq_connect (client, my_endpoint);
     assert (rc == 0);
     expect_bounce_fail (server, client);
     close_zero_linger (client);
@@ -680,7 +681,7 @@ int main (void)
 
     setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,
                                    &server_mon, my_endpoint);
-    test_curve_security_with_plain_client_credentials (ctx, server);
+    test_curve_security_with_plain_client_credentials (ctx, server, my_endpoint);
     shutdown_context_and_server_side (ctx, zap_thread, server, server_mon);
 
     setup_context_and_server_side (&ctx, &handler, &zap_thread, &server,