diff --git a/.travis/build_maxscale.sh b/.travis/build_maxscale.sh
index dd1b89658..2aeda7c4f 100644
--- a/.travis/build_maxscale.sh
+++ b/.travis/build_maxscale.sh
@@ -12,9 +12,9 @@ echo TRAVIS_BUILD_DIR: ${TRAVIS_BUILD_DIR}
 mkdir build
 cd build
 
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=Y
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=Y -DBUILD_AVRO=N
 
-make VERBOSE=1
+make
 make test
 sudo make install
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8f5a14a4..6f5e3f833 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,6 @@ set(CMAKE_CXX_FLAGS_DEBUG "${DEBUG_FLAGS} -DSS_DEBUG -DLOG_ASSERT")
 set(CMAKE_CXX_FLAGS_RELEASE "")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-ggdb")
 
-include_directories(avro)
 include_directories(include)
 include_directories(server/inih)
 include_directories(server/modules/include)
@@ -185,8 +184,10 @@ include_directories(${CMAKE_BINARY_DIR}/include)
 include_directories(${CURL_INCLUDE_DIRS})
 
 if (BUILD_AVRO)
+  include_directories(avro)
   add_subdirectory(avro)
 endif()
+
 add_subdirectory(plugins)
 add_subdirectory(query_classifier)
 add_subdirectory(server)
diff --git a/avro/CMakeLists.txt b/avro/CMakeLists.txt
index d76785788..1e86df41d 100644
--- a/avro/CMakeLists.txt
+++ b/avro/CMakeLists.txt
@@ -1,8 +1,10 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(maxavro maxavro.c maxavro_schema.c maxavro_record.c maxavro_file.c)
-target_link_libraries(maxavro maxscale-common jansson)
+if (AVRO_FOUND)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+  add_library(maxavro maxavro.c maxavro_schema.c maxavro_record.c maxavro_file.c)
+  target_link_libraries(maxavro maxscale-common jansson)
 
-add_executable(maxavrocheck maxavrocheck.c)
-target_link_libraries(maxavrocheck maxavro)
-install_executable(maxavrocheck core)
-add_subdirectory(test)
+  add_executable(maxavrocheck maxavrocheck.c)
+  target_link_libraries(maxavrocheck maxavro)
+  install_executable(maxavrocheck core)
+  add_subdirectory(test)
+endif()