diff --git a/test/test_basics.rb b/test/test_basics.rb
index 16991c67..7376cde4 100644
--- a/test/test_basics.rb
+++ b/test/test_basics.rb
@@ -1,53 +1,14 @@
 require 'test_helper'
 
-class TestNode < Minitest::Test
+class TestBasics < Minitest::Test
   def setup
     @doc = CommonMarker.render_doc('Hi *there*')
   end
 
-  def test_walk
-    nodes = []
-    @doc.walk do |node|
-      nodes << node.type
-    end
-    assert_equal [:document, :paragraph, :text, :emph, :text], nodes
-  end
-
-  def test_insert_illegal
-    assert_raises NodeError do
-      @doc.insert_before(@doc)
-    end
-  end
-
   def test_to_html
     assert_equal "<p>Hi <em>there</em></p>\n", @doc.to_html
   end
 
-  def test_html_renderer
-    renderer = HtmlRenderer.new
-    result = renderer.render(@doc)
-    assert_equal "<p>Hi <em>there</em></p>\n", result
-  end
-
-  def test_walk_and_set_string_content
-    @doc.walk do |node|
-      if node.type == :text && node.string_content == 'there'
-        node.string_content = 'world'
-        assert_equal 'world', node.string_content
-      end
-    end
-  end
-
-  def test_walk_and_delete_node
-    @doc.walk do |node|
-      if node.type == :emph
-        node.insert_before(node.first_child)
-        node.delete
-      end
-    end
-    assert_equal "<p>Hi there</p>\n", @doc.to_html
-  end
-
   def test_markdown_to_html
     html = CommonMarker.render_html('Hi *there*')
     assert_equal "<p>Hi <em>there</em></p>\n", html
diff --git a/test/test_node.rb b/test/test_node.rb
new file mode 100644
index 00000000..16991c67
--- /dev/null
+++ b/test/test_node.rb
@@ -0,0 +1,55 @@
+require 'test_helper'
+
+class TestNode < Minitest::Test
+  def setup
+    @doc = CommonMarker.render_doc('Hi *there*')
+  end
+
+  def test_walk
+    nodes = []
+    @doc.walk do |node|
+      nodes << node.type
+    end
+    assert_equal [:document, :paragraph, :text, :emph, :text], nodes
+  end
+
+  def test_insert_illegal
+    assert_raises NodeError do
+      @doc.insert_before(@doc)
+    end
+  end
+
+  def test_to_html
+    assert_equal "<p>Hi <em>there</em></p>\n", @doc.to_html
+  end
+
+  def test_html_renderer
+    renderer = HtmlRenderer.new
+    result = renderer.render(@doc)
+    assert_equal "<p>Hi <em>there</em></p>\n", result
+  end
+
+  def test_walk_and_set_string_content
+    @doc.walk do |node|
+      if node.type == :text && node.string_content == 'there'
+        node.string_content = 'world'
+        assert_equal 'world', node.string_content
+      end
+    end
+  end
+
+  def test_walk_and_delete_node
+    @doc.walk do |node|
+      if node.type == :emph
+        node.insert_before(node.first_child)
+        node.delete
+      end
+    end
+    assert_equal "<p>Hi there</p>\n", @doc.to_html
+  end
+
+  def test_markdown_to_html
+    html = CommonMarker.render_html('Hi *there*')
+    assert_equal "<p>Hi <em>there</em></p>\n", html
+  end
+end
diff --git a/test/test_renderer.rb b/test/test_renderer.rb
new file mode 100644
index 00000000..78645fc8
--- /dev/null
+++ b/test/test_renderer.rb
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class TestRenderer < Minitest::Test
+  def setup
+    @doc = CommonMarker.render_doc('Hi *there*')
+  end
+
+  def test_html_renderer
+    renderer = HtmlRenderer.new
+    result = renderer.render(@doc)
+    assert_equal "<p>Hi <em>there</em></p>\n", result
+  end
+end