diff --git a/tests/functional/openlp_plugins/songs/test_openlyricsexport.py b/tests/functional/openlp_plugins/songs/test_openlyricsexport.py
new file mode 100644
index 000000000..df28db035
--- /dev/null
+++ b/tests/functional/openlp_plugins/songs/test_openlyricsexport.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection                                      #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2014 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan      #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer.   #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Frode Woldsund, Martin Zibricky, Patrick Zimmermann                         #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the Free  #
+# Software Foundation; version 2 of the License.                              #
+#                                                                             #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU General Public License along     #
+# with this program; if not, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+"""
+This module contains tests for the OpenLyrics song importer.
+"""
+
+import os
+import shutil
+from unittest import TestCase
+from tempfile import mkdtemp
+
+from tests.functional import MagicMock, patch
+from tests.helpers.testmixin import TestMixin
+from openlp.plugins.songs.lib.openlyricsexport import OpenLyricsExport
+from openlp.core.common import Registry
+
+
+class TestOpenLyricsExport(TestCase, TestMixin):
+    """
+    Test the functions in the :mod:`openlyricsexport` module.
+    """
+    def setUp(self):
+        """
+        Create the registry
+        """
+        Registry.create()
+        self.temp_folder = mkdtemp()
+
+    def tearDown(self):
+        """
+        Cleanup
+        """
+        shutil.rmtree(self.temp_folder)
+
+    def export_same_filename_test(self):
+        """
+        Test that files is not overwritten if songs has same title and author
+        """
+        # GIVEN: A mocked song_to_xml, 2 mocked songs, a mocked application and an OpenLyricsExport instance
+        with patch('openlp.plugins.songs.lib.openlyricsexport.OpenLyrics.song_to_xml') as mocked_song_to_xml:
+            mocked_song_to_xml.return_value = '<?xml version="1.0" encoding="UTF-8"?>\n<empty/>'
+            author = MagicMock()
+            author.display_name = 'Test Author'
+            song = MagicMock()
+            song.authors = [author]
+            song.title = 'Test Title'
+            parent = MagicMock()
+            parent.stop_export_flag = False
+            mocked_application_object = MagicMock()
+            Registry().register('application', mocked_application_object)
+            ol_export = OpenLyricsExport(parent, [song, song], self.temp_folder)
+
+            # WHEN: Doing the export
+            ol_export.do_export()
+
+            # THEN: The exporter should have created 2 files
+            self.assertTrue(os.path.exists(os.path.join(self.temp_folder,
+                                                        '%s (%s).xml' % (song.title, author.display_name))))
+            self.assertTrue(os.path.exists(os.path.join(self.temp_folder,
+                                                        '%s (%s)-1.xml' % (song.title, author.display_name))))