diff --git a/ci/travis-build.sh b/.ci/travis-build.sh
similarity index 100%
rename from ci/travis-build.sh
rename to .ci/travis-build.sh
diff --git a/ci/travis-prepare.sh b/.ci/travis-prepare.sh
similarity index 67%
rename from ci/travis-prepare.sh
rename to .ci/travis-prepare.sh
index 787d55d..237f4e3 100755
--- a/ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@@ -8,8 +8,25 @@ EOF
 install -d "$HOME/.source"
 cd "$HOME/.source"
 
-git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
-(cd epics-base && git log -n1 )
+add_base_module()
+{
+MODULE=$1
+BRANCH=$2
+( cd epics-base/modules && \
+git clone --quiet --depth 5 --branch "$MODULE"/"$BRANCH" https://github.com/${REPOBASE:-epics-base}/epics-base.git "$MODULE" && \
+cd "$MODULE" && \
+git log -n1 )
+}
+
+if [ "$BRBASE" ]
+then
+  git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+  (cd epics-base && git log -n1 )
+else
+  git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+  ( cd epics-base && git log -n1 )
+  add_base_module libcom "${BRLIBCOM:-master}"
+fi
 
 EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
 
diff --git a/.travis.yml b/.travis.yml
index 8c03b0d..b2e6a92 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,18 @@ addons:
     - clang
     - g++-mingw-w64-i686
 install:
- - ./ci/travis-prepare.sh
+ - ./.ci/travis-prepare.sh
 script:
- - ./ci/travis-build.sh
+ - ./.ci/travis-build.sh
 env:
+ - BRCORE=master BRLIBCOM=master
+ - CMPLR=clang
+ - USR_CXXFLAGS=-std=c++11
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
+ - RTEMS=4.10 TEST=NO
+ - RTEMS=4.9 TEST=NO
  - BRBASE=3.16
- - BRBASE=3.16 CMPLR=clang
- - BRBASE=3.16 USR_CXXFLAGS=-std=c++11
- - BRBASE=3.16 USR_CXXFLAGS=-std=c++11 CMPLR=clang
- - BRBASE=3.16 WINE=32 TEST=NO STATIC=YES
- - BRBASE=3.16 WINE=32 TEST=NO STATIC=NO
  - BRBASE=3.15
  - BRBASE=3.14