diff --git a/CHANGES b/CHANGES
index 1779902ddd..dbaf61c9c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-230 | 2019-04-17 16:44:16 -0700
+
+  * Fix unit test failures on case-insensitive file systems (Jon Siwek, Corelight)
+
 2.6-227 | 2019-04-16 17:44:31 -0700
 
   * GH-237: add `@load foo.bro` -> foo.zeek fallback (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index 168f57bc28..7f4be0e904 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-227
+2.6-230
diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh
index 5498e515ca..dac1eeb3c2 100644
--- a/testing/btest/plugins/bifs-and-scripts-install.sh
+++ b/testing/btest/plugins/bifs-and-scripts-install.sh
@@ -4,20 +4,20 @@
 # @TEST-EXEC: make
 # @TEST-EXEC: make install
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro -NN Demo::Foo >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro demo/foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd`/test-install bro Demo/Foo -r $TRACES/empty.trace >>output
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
-mkdir -p scripts/demo/foo/base/
+mkdir -p scripts/Demo/Foo/base/
 
 cat >scripts/__load__.zeek <<EOF
-@load ./demo/foo/base/at-startup.bro
+@load ./Demo/Foo/base/at-startup.zeek
 EOF
 
-cat >scripts/demo/foo/__load__.bro <<EOF
-@load ./manually.bro
+cat >scripts/Demo/Foo/__load__.zeek <<EOF
+@load ./manually.zeek
 EOF
 
-cat >scripts/demo/foo/manually.bro <<EOF
+cat >scripts/Demo/Foo/manually.zeek <<EOF
 event bro_init() &priority=-10
         {
         print "plugin: manually loaded";
@@ -25,7 +25,7 @@ event bro_init() &priority=-10
         }
 EOF
 
-cat >scripts/demo/foo/base/at-startup.bro <<EOF
+cat >scripts/Demo/Foo/base/at-startup.zeek <<EOF
 event bro_init() &priority=10
         {
         print "plugin: automatically loaded at startup";
@@ -41,7 +41,7 @@ function hello_plugin_world%(%): string
 event plugin_event%(foo: count%);
 EOF
 
-cat >activate.bro <<EOF
+cat >activate.zeek <<EOF
 @load-plugin Demo::Foo
 EOF
 
diff --git a/testing/btest/plugins/bifs-and-scripts.sh b/testing/btest/plugins/bifs-and-scripts.sh
index d27a33224f..7bdeb26030 100644
--- a/testing/btest/plugins/bifs-and-scripts.sh
+++ b/testing/btest/plugins/bifs-and-scripts.sh
@@ -6,34 +6,34 @@
 # @TEST-EXEC: echo === >>output
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/empty.trace >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro demo/foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: echo =-= >>output
 # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b -r $TRACES/empty.trace >>output
 # @TEST-EXEC: echo =-= >>output
-# @TEST-EXEC-FAIL: BRO_PLUGIN_PATH=`pwd` bro -b demo/foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC-FAIL: BRO_PLUGIN_PATH=`pwd` bro -b Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.bro -r $TRACES/empty.trace >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.zeek -r $TRACES/empty.trace >>output
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.bro  demo/foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b ./activate.zeek  Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: echo === >>output
-# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b Demo::Foo  demo/foo -r $TRACES/empty.trace >>output
+# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -b Demo::Foo  Demo/Foo -r $TRACES/empty.trace >>output
 
 # @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff output
 
-mkdir -p scripts/demo/foo/base/
+mkdir -p scripts/Demo/Foo/base/
 
 cat >scripts/__load__.zeek <<EOF
-@load ./demo/foo/base/at-startup.bro
+@load ./Demo/Foo/base/at-startup.zeek
 EOF
 
-cat >scripts/demo/foo/__load__.bro <<EOF
-@load ./manually.bro
+cat >scripts/Demo/Foo/__load__.zeek <<EOF
+@load ./manually.zeek
 EOF
 
-cat >scripts/demo/foo/manually.bro <<EOF
+cat >scripts/Demo/Foo/manually.zeek <<EOF
 event bro_init() &priority=-10
         {
         print "plugin: manually loaded";
@@ -41,7 +41,7 @@ event bro_init() &priority=-10
         }
 EOF
 
-cat >scripts/demo/foo/base/at-startup.bro <<EOF
+cat >scripts/Demo/Foo/base/at-startup.zeek <<EOF
 event bro_init() &priority=10
         {
         print "plugin: automatically loaded at startup";
@@ -57,7 +57,7 @@ function hello_plugin_world%(%): string
 event plugin_event%(foo: count%);
 EOF
 
-cat >activate.bro <<EOF
+cat >activate.zeek <<EOF
 @load-plugin Demo::Foo
 EOF