diff --git a/.gitignore b/.gitignore
index 5d501780..9aaadb67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ etc/Makefile
 example/Makefile
 lib/Makefile
 lib/*/Makefile
+test/Makefile
 yang/Makefile
 yang/*/Makefile
 autom4te.cache/
diff --git a/.travis.yml b/.travis.yml
index e196c5cc..33c8297c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,9 @@
-language: c
\ No newline at end of file
+language: c
+# safelist
+branches:
+  only:
+  - master
+  - develop
+before_script:
+  - ./test/travis/before_script.sh
+ 
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da943f33..ead8194c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -119,6 +119,7 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added make test from top-level
 * Added `xml_rootchild_node()` lib function as variant of `xml_rootchild()`
 * Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
   * Any config option from file can be overrided by giving them on command-line.
diff --git a/Makefile.in b/Makefile.in
index a1a9f1f0..0c8c8203 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,7 @@ SHELL		= /bin/sh
 
 SUBDIRS = lib apps include etc datastore util yang
 
-.PHONY:	doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker
+.PHONY:	doc all clean depend $(SUBDIRS) install loc TAGS .config.status docker test
 
 all:	$(SUBDIRS)
 
@@ -138,6 +138,9 @@ pkg-rpm: dist
 pkg-srpm: dist
 	make -C extras/rpm srpm
 
+test:	install-include
+	(cd $@ && $(MAKE) $(MFLAGS) all)
+
 docker:
 	for i in docker; \
 		do (cd $$i && $(MAKE) $(MFLAGS) $@); done
diff --git a/configure b/configure
index a5767406..08476986 100755
--- a/configure
+++ b/configure
@@ -4433,7 +4433,7 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/standard/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/standard/Makefile doc/Makefile test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5149,6 +5149,7 @@ do
     "yang/clixon/Makefile") CONFIG_FILES="$CONFIG_FILES yang/clixon/Makefile" ;;
     "yang/standard/Makefile") CONFIG_FILES="$CONFIG_FILES yang/standard/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index f6aa83e7..13cd7712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,5 +249,6 @@ AC_OUTPUT(Makefile
   	  yang/clixon/Makefile
   	  yang/standard/Makefile
 	  doc/Makefile
+	  test/Makefile	
 )
 
diff --git a/test/Jenkinsfile b/test/jenkins/Jenkinsfile
similarity index 100%
rename from test/Jenkinsfile
rename to test/jenkins/Jenkinsfile
diff --git a/test/travis/before_script.sh b/test/travis/before_script.sh
new file mode 100644
index 00000000..9cc6f7a3
--- /dev/null
+++ b/test/travis/before_script.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+git clone https://github.com/olofhagsand/cligen.git
+(cd cligen && ./configure && make && sudo make install)