diff --git a/scripts/travis-build-test.sh b/scripts/travis-build-test.sh
index 05bd9b8e6f1..1564fbf0786 100755
--- a/scripts/travis-build-test.sh
+++ b/scripts/travis-build-test.sh
@@ -2,5 +2,5 @@
 cd src
 ./autogen.sh
 ./configure --with-realtime=uspace --disable-check-runtime-deps --enable-build-documentation
-make -j2  # cores: ~2, bursted
-../scripts/rip-environment runtests -v
+make -O -j$(nproc)
+../scripts/rip-environment runtests
diff --git a/scripts/travis-install-build-deps.sh b/scripts/travis-install-build-deps.sh
index 0327b4ed827..df84a5fd5a4 100755
--- a/scripts/travis-install-build-deps.sh
+++ b/scripts/travis-install-build-deps.sh
@@ -1,7 +1,9 @@
 #!/bin/sh -e
+sudo sh -c 'echo deb-src http://us.archive.ubuntu.com/ubuntu/ xenial main universe >> /etc/apt/sources.list'
+grep . /etc/apt/sources.list /etc/apt/sources.list.d/*
 sudo apt-get update -qq
 sudo apt-get install -y devscripts equivs build-essential --no-install-recommends
 sudo apt-get remove -f libreadline6-dev || true
 sudo apt-get remove -f libreadline-dev || true
-debian/configure uspace
+debian/configure uspace noauto
 mk-build-deps -i -r -s sudo -t 'apt-get --no-install-recommends --no-install-suggests'
diff --git a/src/hal/user_comps/Submakefile b/src/hal/user_comps/Submakefile
index a2ab65c83e6..182e9b721c2 100644
--- a/src/hal/user_comps/Submakefile
+++ b/src/hal/user_comps/Submakefile
@@ -75,7 +75,7 @@ USERSRCS += $(XHC_HB04_SRC)
 $(call TOOBJSDEPS, $(XHC_HB04_SRC)) : EXTRAFLAGS += $(LIBUSB10_CFLAGS)
 ../bin/xhc-hb04: $(call TOOBJS, $(XHC_HB04_SRC)) ../lib/liblinuxcnchal.so.0 ../lib/liblinuxcncini.so.0
 	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) -o $@ $^ -lm -lstdc++ $(LIBUSB10_LIBS)
+	$(Q)$(CXX) $(LDFLAGS) -o $@ $^ -lm $(LIBUSB10_LIBS)
 TARGETS += ../bin/xhc-hb04
 endif # HAVE_LIBUSB10
 
diff --git a/src/hal/user_comps/xhc-whb04b-6/Submakefile b/src/hal/user_comps/xhc-whb04b-6/Submakefile
index 813f67facea..a423df5ca8f 100644
--- a/src/hal/user_comps/xhc-whb04b-6/Submakefile
+++ b/src/hal/user_comps/xhc-whb04b-6/Submakefile
@@ -10,35 +10,14 @@ XHC_WHB04B6_SRC = hal/user_comps/xhc-whb04b-6/hal.cc \
 
 XHC_WHB04B6_DEBUG = -g -funwind-tables
 XHC_WHB04B6_CFLAGS += $(LIBUSB10_CFLAGS) $(XHC_WHB04B6_DEBUG) -Wall
-XHC_WHB04B6_LIBS = -lstdc++ $(LIBUSB10_LIBS) $(PROTOBUF_LIBS)
-XHC_WHB04B6_LIBS = -lm -lstdc++ $(LIBUSB10_LIBS)
+XHC_WHB04B6_LIBS = -lm $(LIBUSB10_LIBS)
 
 $(call TOOBJSDEPS, $(XHC_WHB04B6_SRC)) : EXTRAFLAGS += $(XHC_WHB04B6_CFLAGS)
 
-xhc-whb04b6.o xhc-whb04b6.d : xhc-whb04b6.c xhc-whb04b6.h $(XHC_WHB04B6_LIB_DEPENDENCIES)
-	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) $(XHC_WHB04B6_LIBS) -o $@ $^
-
-pendant-types.o pendant-types.d : pendant-types.c pendant-types.h $(XHC_WHB04B6_LIB_DEPENDENCIES)
-	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) $(XHC_WHB04B6_LIBS) -o $@ $^
-
-pendant.o pendant.d : pendant.c pendant.h $(XHC_WHB04B6_LIB_DEPENDENCIES)
-	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) $(XHC_WHB04B6_LIBS) -o $@ $^
-
-hal.o hal.d : hal.c hal.h $(XHC_WHB04B6_LIB_DEPENDENCIES)
-	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) $(XHC_WHB04B6_LIBS) -o $@ $^
-
-usb.o usb.d : usb.c usb.h $(XHC_WHB04B6_LIB_DEPENDENCIES)
-	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) $(XHC_WHB04B6_LIBS) -o $@ $^
-
 USERSRCS += $(XHC_WHB04B6_SRC)
 ../bin/xhc-whb04b-6 xhc-whb04b-6.d : $(call TOOBJS, $(XHC_WHB04B6_SRC)) $(XHC_WHB04B6_LIB_DEPENDENCIES)
 	$(ECHO) Linking $(notdir $@)
-	$(Q)$(CC) $(LDFLAGS) $(XHC_WHB04B6_LIBS) -o $@ $^
+	$(Q)$(CXX) $(LDFLAGS) -o $@ $^ $(XHC_WHB04B6_LIBS)
 
 TARGETS += ../bin/xhc-whb04b-6