diff --git a/.travis.yml b/.travis.yml
index f2235a1..03502ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ env:
   matrix:
     - BUILD_TYPE=default
     - BUILD_TYPE=default-Werror
-    - BUILD_TYPE=cmake
+#    - BUILD_TYPE=cmake
 #   - BUILD_TYPE=android
 #   - BUILD_TYPE=check-py
 
diff --git a/ci_build.sh b/ci_build.sh
index 66bb891..8850377 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -266,14 +266,10 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
     git status -s || true
     echo "==="
 
-    (
-        export DISTCHECK_CONFIGURE_FLAGS="--enable-drafts=yes ${CONFIG_OPTS[@]}"
-        $CI_TIME make VERBOSE=1 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" distcheck
-
-        echo "=== Are GitIgnores good after 'make distcheck' with drafts? (should have no output below)"
-        git status -s || true
-        echo "==="
-    )
+    make check
+    #MVY: manually added
+    killall -9 zmsq_selftest ||:
+    killall -9 mosquitto ||:
 
     # Build and check this project without DRAFT APIs
     echo ""
@@ -286,10 +282,11 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
         $CI_TIME ./autogen.sh 2> /dev/null
         $CI_TIME ./configure --enable-drafts=no "${CONFIG_OPTS[@]}" --with-docs=yes
         $CI_TIME make VERBOSE=1 all || exit $?
-        (
-            export DISTCHECK_CONFIGURE_FLAGS="--enable-drafts=no ${CONFIG_OPTS[@]} --with-docs=yes" && \
-            $CI_TIME make VERBOSE=1 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" distcheck || exit $?
-        )
+        make check
+        #MVY: manually added
+        killall -9 zmsq_selftest ||:
+        killall -9 mosquitto ||:
+
     ) || exit 1
     [ -z "$CI_TIME" ] || echo "`date`: Builds completed without fatal errors!"
 
diff --git a/project.xml b/project.xml
index 84db1a2..61ad53a 100644
--- a/project.xml
+++ b/project.xml
@@ -6,7 +6,9 @@
     repository = "https://github.com/ZMQers/zmosq"
     url = "https://github.com/ZMQers/zmosq">
 
-    <target name="travis" />
+    <target name="travis">
+        <option name="distcheck" value="0" />
+    </target>
 
     <include filename = "license.xml" />
     <version major = "0" minor = "1" />