diff --git a/composer.json b/composer.json
index 417c763..86735c1 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
     },
     "require-dev": {
         "ext-fileinfo": "*",
+        "phpspec/prophecy": "^1.10.2",
         "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.20 || ^9.5.9",
         "psr/log": "^1.0"
     },
diff --git a/tests/Gitonomy/Git/Tests/AbstractTest.php b/tests/Gitonomy/Git/Tests/AbstractTest.php
index d586eda..0b9a51b 100644
--- a/tests/Gitonomy/Git/Tests/AbstractTest.php
+++ b/tests/Gitonomy/Git/Tests/AbstractTest.php
@@ -20,6 +20,7 @@ abstract class AbstractTest extends TestCase
 {
     const REPOSITORY_URL = 'https://github.com/gitonomy/foobar.git';
 
+    const NO_MESSAGE_COMMIT = '011cd0c1625190d2959ee9a8f9f822006d94b661';
     const LONGFILE_COMMIT = '4f17752acc9b7c54ba679291bf24cb7d354f0f4f';
     const BEFORE_LONGFILE_COMMIT = 'e0ec50e2af75fa35485513f60b2e658e245227e9';
     const LONGMESSAGE_COMMIT = '3febd664b6886344a9b32d70657687ea4b1b4fab';
diff --git a/tests/Gitonomy/Git/Tests/CommitTest.php b/tests/Gitonomy/Git/Tests/CommitTest.php
index 8dca9c4..7d09464 100644
--- a/tests/Gitonomy/Git/Tests/CommitTest.php
+++ b/tests/Gitonomy/Git/Tests/CommitTest.php
@@ -16,6 +16,7 @@
 use Gitonomy\Git\Diff\Diff;
 use Gitonomy\Git\Exception\InvalidArgumentException;
 use Gitonomy\Git\Exception\ReferenceNotFoundException;
+use Gitonomy\Git\Repository;
 use Gitonomy\Git\Tree;
 
 class CommitTest extends AbstractTest
@@ -189,6 +190,31 @@ public function testGetMessage($repository)
         $this->assertEquals('add a long file'."\n", $commit->getMessage());
     }
 
+    /**
+     * @dataProvider provideFoobar
+     *
+     * @param $repository Repository
+     */
+    public function testGetEmptyMessage($repository)
+    {
+        $commit = $repository->getCommit(self::NO_MESSAGE_COMMIT);
+
+        $this->assertEquals('', $commit->getMessage());
+    }
+
+    /**
+     * @dataProvider provideFoobar
+     *
+     * @param $repository Repository
+     */
+    public function testGetEmptyMessageFromLog($repository)
+    {
+        $commit = $repository->getCommit(self::NO_MESSAGE_COMMIT);
+        $commitMessageFromLog = $commit->getLog()->getCommits()[0]->getMessage();
+
+        $this->assertEquals('', $commitMessageFromLog);
+    }
+
     /**
      * This test ensures that GPG signed commits does not break the reading of a commit
      * message.