diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 80a08b6..289a215 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="test/bootstrap.php" colors="true">
 	<testsuites>
-        <testsuite name="ParsedownTests">
-            <file>test/Test.php</file>
-        </testsuite>
-		<testsuite name="StandardMarkdown">
-			<file>test/standard-markdown/StandardMarkdownTest.php</file>
+		<testsuite name="ParsedownTests">
+			<file>test/Test.php</file>
+		</testsuite>
+		<testsuite name="CommonMark">
+			<file>test/commonmark/CommonMarkTest.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/test/standard-markdown/.gitignore b/test/commonmark/.gitignore
similarity index 100%
rename from test/standard-markdown/.gitignore
rename to test/commonmark/.gitignore
diff --git a/test/standard-markdown/StandardMarkdownTest.php b/test/commonmark/CommonMarkTest.php
similarity index 97%
rename from test/standard-markdown/StandardMarkdownTest.php
rename to test/commonmark/CommonMarkTest.php
index a34b0a7..a2b404f 100644
--- a/test/standard-markdown/StandardMarkdownTest.php
+++ b/test/commonmark/CommonMarkTest.php
@@ -5,7 +5,7 @@
  *
  * Some code based on the original JavaScript test runner by jgm.
  *
- * @link http://commonmark.net/ CommonMark
+ * @link http://commonmark.org/ CommonMark
  * @link http://git.io/8WtRvQ JavaScript test runner
  */
 class CommonMarkTest extends PHPUnit_Framework_TestCase