diff --git a/test/parse/test_entity_declaration.rb b/test/parse/test_entity_declaration.rb
index c4ba525a..62765858 100644
--- a/test/parse/test_entity_declaration.rb
+++ b/test/parse/test_entity_declaration.rb
@@ -71,19 +71,6 @@ def test_prohibited_character
  valid-name \"% &\">]>
             DETAIL
           end
-
-          def test_unnecessary_ndata_declaration
-            exception = assert_raise(REXML::ParseException) do
-              REXML::Document.new('<!DOCTYPE root [<!ENTITY valid-name "valid-entity-value" NDATA valid-ndata-value>]>')
-            end
-            assert_equal(<<-DETAIL.chomp, exception.to_s)
-Malformed entity declaration
-Line: 1
-Position: 83
-Last 80 unconsumed characters:
- valid-name \"valid-entity-value\" NDATA valid-ndata-value>]>
-        DETAIL
-          end
         end
 
         # https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-ExternalID
@@ -165,6 +152,19 @@ def test_prohibited_character
             DETAIL
           end
         end
+
+        def test_entity_value_and_notation_data_declaration
+          exception = assert_raise(REXML::ParseException) do
+            REXML::Document.new('<!DOCTYPE root [<!ENTITY valid-name "valid-entity-value" NDATA valid-ndata-value>]>')
+          end
+          assert_equal(<<-DETAIL.chomp, exception.to_s)
+Malformed entity declaration
+Line: 1
+Position: 83
+Last 80 unconsumed characters:
+ valid-name \"valid-entity-value\" NDATA valid-ndata-value>]>
+        DETAIL
+        end
       end
     end
 
@@ -280,7 +280,7 @@ def test_invalid_pubid_char
           end
         end
 
-        def test_unnecessary_ndata_declaration
+        def test_entity_value_and_notation_data_declaration
           exception = assert_raise(REXML::ParseException) do
             REXML::Document.new('<!DOCTYPE root [<!ENTITY % valid-name "valid-entity-value" NDATA valid-ndata-value>]>')
           end