diff --git a/tests/interfaces/openlp_core/ui/lib/test_historycombobox.py b/tests/interfaces/openlp_core/ui/lib/test_historycombobox.py
deleted file mode 100644
index 96c835398..000000000
--- a/tests/interfaces/openlp_core/ui/lib/test_historycombobox.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2017 OpenLP Developers                                   #
-# --------------------------------------------------------------------------- #
-# 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                          #
-###############################################################################
-"""
-Module to test the :mod:`~openlp.core.common.historycombobox` module.
-"""
-
-from unittest import TestCase
-
-from PyQt5 import QtWidgets
-
-from openlp.core.common.registry import Registry
-from openlp.core.ui.lib.historycombobox import HistoryComboBox
-from tests.helpers.testmixin import TestMixin
-
-
-class TestHistoryComboBox(TestCase, TestMixin):
-    def setUp(self):
-        """
-        Some pre-test setup required.
-        """
-        Registry.create()
-        self.setup_application()
-        self.main_window = QtWidgets.QMainWindow()
-        Registry().register('main_window', self.main_window)
-        self.combo = HistoryComboBox(self.main_window)
-
-    def tearDown(self):
-        """
-        Delete all the C++ objects at the end so that we don't have a segfault
-        """
-        del self.combo
-        del self.main_window
-
-    def test_get_items(self):
-        """
-        Test the getItems() method
-        """
-        # GIVEN: The combo.
-
-        # WHEN: Add two items.
-        self.combo.addItem('test1')
-        self.combo.addItem('test2')
-
-        # THEN: The list of items should contain both strings.
-        self.assertEqual(self.combo.getItems(), ['test1', 'test2'])
diff --git a/tests/utils/test_bzr_tags.py b/tests/utils/test_git_tags.py
similarity index 97%
rename from tests/utils/test_bzr_tags.py
rename to tests/utils/test_git_tags.py
index 6a73a0010..def579317 100644
--- a/tests/utils/test_bzr_tags.py
+++ b/tests/utils/test_git_tags.py
@@ -68,11 +68,11 @@ class TestGitTags(TestCase):
 
         # WHEN: getting the tags
         try:
-            git = Popen(('git', 'tags'), stdout=PIPE)
+            git = Popen(('git', 'tag'), stdout=PIPE)
         except Exception:
             raise SkipTest('git is not installed')
 
-        std_out = bzr.communicate()[0]
+        std_out = git.communicate()[0]
 
         count = len(TAGS1)
         tags = [line.decode('utf-8').split()[0] for line in std_out.splitlines()]