diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs2 b/test/fixtures/Data/Modelines/seeplusplusEmacs2
new file mode 100644
index 00000000..3756149c
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs2
@@ -0,0 +1,2 @@
+// -*- c++ -*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs3 b/test/fixtures/Data/Modelines/seeplusplusEmacs3
new file mode 100644
index 00000000..7a871e6a
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs3
@@ -0,0 +1,2 @@
+// -*- mode:C++ -*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs4 b/test/fixtures/Data/Modelines/seeplusplusEmacs4
new file mode 100644
index 00000000..f020eb5a
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs4
@@ -0,0 +1,2 @@
+// -*- font:bar;mode:c++ -*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs5 b/test/fixtures/Data/Modelines/seeplusplusEmacs5
new file mode 100644
index 00000000..49e9a7d6
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs5
@@ -0,0 +1,2 @@
+// -*-foo:bar;mode:c++;bar:foo-*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs6 b/test/fixtures/Data/Modelines/seeplusplusEmacs6
new file mode 100644
index 00000000..305f7f77
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs6
@@ -0,0 +1,2 @@
+// -*- foo : bar ; mode : c++ ; bar : foo -*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs7 b/test/fixtures/Data/Modelines/seeplusplusEmacs7
new file mode 100644
index 00000000..236c3b8e
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs7
@@ -0,0 +1,2 @@
+// -*- mode : c++ ; bar : foo -*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs8 b/test/fixtures/Data/Modelines/seeplusplusEmacs8
new file mode 100644
index 00000000..3efc2c57
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs8
@@ -0,0 +1,2 @@
+// -*- font:x;foo : bar ; mode : C++ ; bar : foo -*-
+template <typename X> class { X i; };
diff --git a/test/fixtures/Data/Modelines/seeplusplusEmacs9 b/test/fixtures/Data/Modelines/seeplusplusEmacs9
new file mode 100644
index 00000000..953ca220
--- /dev/null
+++ b/test/fixtures/Data/Modelines/seeplusplusEmacs9
@@ -0,0 +1,2 @@
+// -*-foo:bar;mode:c++;bar:foo;tyrell:corp-*-
+template <typename X> class { X i; };
diff --git a/test/test_modelines.rb b/test/test_modelines.rb
index 6c68cc87..cd8fbaad 100644
--- a/test/test_modelines.rb
+++ b/test/test_modelines.rb
@@ -10,6 +10,15 @@ class TestModelines < Minitest::Test
   def test_modeline_strategy
     assert_modeline Language["Ruby"], fixture_blob("Data/Modelines/ruby")
     assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplus")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs1")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs2")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs3")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs4")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs5")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs6")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs7")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs8")
+    assert_modeline Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs9")
     assert_modeline Language["Prolog"], fixture_blob("Data/Modelines/not_perl.pl")
     assert_modeline Language["Smalltalk"], fixture_blob("Data/Modelines/example_smalltalk.md")
     assert_modeline Language["PHP"], fixture_blob("Data/Modelines/iamphp.inc")
@@ -18,6 +27,15 @@ class TestModelines < Minitest::Test
   def test_modeline_languages
     assert_equal Language["Ruby"], fixture_blob("Data/Modelines/ruby").language
     assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplus").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs1").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs2").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs3").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs4").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs5").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs6").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs7").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs8").language
+    assert_equal Language["C++"], fixture_blob("Data/Modelines/seeplusplusEmacs9").language
     assert_equal Language["Prolog"], fixture_blob("Data/Modelines/not_perl.pl").language
     assert_equal Language["Smalltalk"], fixture_blob("Data/Modelines/example_smalltalk.md").language
     assert_equal Language["PHP"], fixture_blob("Data/Modelines/iamphp.inc").language