diff --git a/Makefile b/Makefile
index fb8769a744..5dd5d77121 100644
--- a/Makefile
+++ b/Makefile
@@ -123,11 +123,13 @@ test-build: all build-addons
 
 test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
 	$(PYTHON) tools/test.py --mode=debug,release
-	make test-npm
 
 test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
+test-ci: test-build
+	$(PYTHON) tools/test.py -J parallel sequential message addons
+
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
 
diff --git a/tools/cpplint.py b/tools/cpplint.py
index 603c4aba97..5ab156124a 100644
--- a/tools/cpplint.py
+++ b/tools/cpplint.py
@@ -210,7 +210,7 @@ _ERROR_CATEGORIES = [
 # flag. By default all errors are on, so only add here categories that should be
 # off by default (i.e., categories that must be enabled by the --filter= flags).
 # All entries here should start with a '-' or '+', as in the --filter= flag.
-_DEFAULT_FILTERS = [ '-build/include_alpha' ]
+_DEFAULT_FILTERS = [ '-build/include_alpha', '-legal/copyright' ]
 
 # We used to check for high-bit characters, but after much discussion we
 # decided those were OK, as long as they were in UTF-8 and didn't represent
diff --git a/tools/test.py b/tools/test.py
index c78599bf06..074a918f2a 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -1357,6 +1357,7 @@ BUILT_IN_TESTS = [
   'pummel',
   'message',
   'internet',
+  'addons',
   'gc',
   'debugger',
 ]