diff --git a/.travis.yml b/.travis.yml
index ef0818fb..430ae543 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,16 +6,9 @@ language: c
 before_script:
 
 #   libsodium
-#   Commit 8d0942 broke installation (sodium.h not found) so for now
-#   we're checking out the last good commit.
 - git clone git://github.com/jedisct1/libsodium.git
-- cd libsodium
-- git checkout e2a30a
-- ./autogen.sh
-- ./configure && make check
-- sudo make install
-- sudo ldconfig
-- cd ..
+- ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
 
 #   Build and check libzmq
-script: ./autogen.sh && ./configure && make && make check
+script:
+- ./autogen.sh && ./configure && make && make check
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e3d685da..329e378e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,7 +54,7 @@ noinst_PROGRAMS = test_system \
                   test_metadata \
                   test_id2fd \
                   test_capabilities \
-                  test_xpub_wait_inproc
+                  test_xpub_nodrop
 
 if !ON_MINGW
 noinst_PROGRAMS += test_shutdown_stress \
diff --git a/tests/test_xpub_wait_inproc.cpp b/tests/test_xpub_nodrop.cpp
similarity index 100%
rename from tests/test_xpub_wait_inproc.cpp
rename to tests/test_xpub_nodrop.cpp