diff --git a/contrib/build-server/openmpi-nightly-coverity.pl b/contrib/build-server/openmpi-nightly-coverity.pl
index 6975d3ea51..12390ab22d 100755
--- a/contrib/build-server/openmpi-nightly-coverity.pl
+++ b/contrib/build-server/openmpi-nightly-coverity.pl
@@ -105,7 +105,7 @@ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
 my $now = time();
 if (!defined($mtime) || $mtime < $now - 24*60*60) {
     verbose "*** Downloading new copy of the coverity tool\n";
-    safe_system(0, "wget $coverity_tool_url --post-data \"token=$coverity_token_arg\&project=$coverity_project\" -O coverity_tool.tgz");
+    safe_system(0, "wget $coverity_tool_url --post-data \"token=$coverity_token_arg&project=$coverity_project\" -O coverity_tool.tgz");
     safe_system(0, "cp coverity_tool.tgz $cdir");
 }
 
diff --git a/contrib/build-server/openmpi-nightly-tarball.sh b/contrib/build-server/openmpi-nightly-tarball.sh
index 546bb4896b..dae9e99005 100755
--- a/contrib/build-server/openmpi-nightly-tarball.sh
+++ b/contrib/build-server/openmpi-nightly-tarball.sh
@@ -39,7 +39,7 @@ build_root=$HOME/openmpi/nightly-tarball-build-root
 
 # Coverity stuff
 coverity_token=`cat $HOME/coverity/openmpi-token.txt`
-coverity_configure_args="--enable-debug --enable-mpi-fortran --enable-mpi-java --enable-oshmem --enable-oshmem-fortran --enable-oshmem-java --with-mxm=/opt/mellanox/mxm --with-psm --with-usnic --with-libfabric=/u/mpiteam/libfabric-current/install"
+coverity_configure_args="--enable-debug --enable-mpi-fortran --enable-mpi-java --enable-oshmem --enable-oshmem-fortran --enable-oshmem-java --with-mxm --with-psm --with-usnic --with-libfabric"
 
 export PATH=$HOME_PREFIX/bin:$PATH
 export LD_LIBRARY_PATH=$HOME_PREFIX/lib:$LD_LIBRARY_PATH
diff --git a/contrib/build-server/pmix-nightly-coverity.pl b/contrib/build-server/pmix-nightly-coverity.pl
index 6140147856..53dce9f1a0 100755
--- a/contrib/build-server/pmix-nightly-coverity.pl
+++ b/contrib/build-server/pmix-nightly-coverity.pl
@@ -105,7 +105,7 @@ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
 my $now = time();
 if (!defined($mtime) || $mtime < $now - 24*60*60) {
     verbose "*** Downloading new copy of the coverity tool\n";
-    safe_system(0, "wget $coverity_tool_url --post-data \"token=$coverity_token_arg\&project=$coverity_project\" -O coverity_tool.tgz");
+    safe_system(0, "wget $coverity_tool_url --post-data \"token=$coverity_token_arg&project=$coverity_project\" -O coverity_tool.tgz");
     safe_system(0, "cp coverity_tool.tgz $cdir");
 }