diff --git a/test/imap_0006.yml b/test/imap_0006.yaml
similarity index 93%
rename from test/imap_0006.yml
rename to test/imap_0006.yaml
index 5d4add0..fe77b3c 100644
--- a/test/imap_0006.yml
+++ b/test/imap_0006.yaml
@@ -3,5 +3,5 @@ data: "imap-login: Disconnected: Too many invalid commands (no auth attempts in
 results:
     "[dovecot][protocol]": "imap"
     "[dovecot][session]": "MD9B9FyivNXA8exM"
-    "[dovecot][disconnect_reason]": "Too many invalid commands (no auth attempts in 0 secs)
+    "[dovecot][disconnect_reason]": "Too many invalid commands (no auth attempts in 0 secs)"
     "[dovecot][keyvalue_data]": "user=<>, rip=192.0.2.4, lip=192.0.2.111"
diff --git a/test/imap_0007.yml b/test/imap_0007.yaml
similarity index 100%
rename from test/imap_0007.yml
rename to test/imap_0007.yaml
diff --git a/test/logstash-patterns-core b/test/logstash-patterns-core
index 4eef822..f01f3f3 160000
--- a/test/logstash-patterns-core
+++ b/test/logstash-patterns-core
@@ -1 +1 @@
-Subproject commit 4eef822e8dd615207e16eb9b6791465d1a1db8e6
+Subproject commit f01f3f34cfab13a28b0822bdba33db41823cb1d8
diff --git a/test/test.rb b/test/test.rb
index 23e2fb4..c3a6eae 100644
--- a/test/test.rb
+++ b/test/test.rb
@@ -12,10 +12,10 @@
 # It creates test cases from all yaml files in the current
 # directory.
 
-class TestGrokPatterns < MiniTest::Test
+class TestGrokPatterns < Minitest::Test
 
     @@test_dir = File.dirname(__FILE__)
-    @@upstream_pattern_dir = @@test_dir + '/logstash-patterns-core/patterns'
+    @@upstream_pattern_dir = @@test_dir + '/logstash-patterns-core/patterns/ecs-v1'
     @@local_pattern_dir = File.dirname(File.expand_path(@@test_dir))
 
     # Prepare a grok object.