diff --git a/CHANGES b/CHANGES
index 865052fa1c..ecc7ae90d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.3-555 | 2015-03-17 15:57:13 -0700
+
+  * Splitting test-all Makefile target into Bro tests and test-aux.
+    (Robin Sommer)
+
 2.3-554 | 2015-03-17 15:40:39 -0700
 
   * Deprecate &rotate_interval, &rotate_size, &encrypt. Addresses
diff --git a/Makefile b/Makefile
index 207ce72780..3efddc4dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,15 @@ distclean:
 	$(MAKE) -C testing $@
 
 test:
-	@( cd testing && make )
+	-@( cd testing && make )
 
-test-all: test
-	test -d aux/broctl && ( cd aux/broctl && make test-all )
-	test -d aux/btest  && ( cd aux/btest && make test )
-	test -d aux/bro-aux && ( cd aux/bro-aux && make test )
-	test -d aux/plugins && ( cd aux/plugins && make test-all )
+test-aux:
+	-test -d aux/broctl && ( cd aux/broctl && make test-all )
+	-test -d aux/btest  && ( cd aux/btest && make test )
+	-test -d aux/bro-aux && ( cd aux/bro-aux && make test )
+	-test -d aux/plugins && ( cd aux/plugins && make test-all )
+
+test-all: test test-aux
 
 configured:
 	@test -d $(BUILD) || ( echo "Error: No build/ directory found. Did you run configure?" && exit 1 )
diff --git a/VERSION b/VERSION
index 1b240f1fbf..5195f911b3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-554
+2.3-555