diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 96d789158..a43735a88 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -107,6 +107,7 @@ TEST(TestQPrefDisplay testqPrefDisplay.cpp)
 TEST(TestQPrefDiveComputer testqPrefDiveComputer.cpp)
 TEST(TestQPrefDivePlanner testqPrefDivePlanner.cpp)
 TEST(TestQPrefFacebook testqPrefFacebook.cpp)
+TEST(TestQPrefGeocoding testqPrefGeocoding.cpp)
 TEST(TestQPrefLanguage testqPrefLanguage.cpp)
 TEST(TestQPrefLocationService testqPrefLocationService.cpp)
 TEST(TestQPrefProxy testqPrefProxy.cpp)
@@ -137,6 +138,7 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}
 	TestQPrefDiveComputer
 	TestQPrefDivePlanner
 	TestQPrefFacebook
+	TestQPrefGeocoding
 	TestQPrefLanguage
 	TestQPrefLocationService
 	TestQPrefProxy
diff --git a/tests/testqPrefGeocoding.cpp b/tests/testqPrefGeocoding.cpp
new file mode 100644
index 000000000..b0dbcbc6c
--- /dev/null
+++ b/tests/testqPrefGeocoding.cpp
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "testqPrefGeocoding.h"
+
+#include "core/pref.h"
+#include "core/qthelper.h"
+#include "core/settings/qPref.h"
+
+#include <QTest>
+
+void TestQPrefGeocoding::initTestCase()
+{
+	QCoreApplication::setOrganizationName("Subsurface");
+	QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
+	QCoreApplication::setApplicationName("SubsurfaceTestQPrefGeocoding");
+}
+
+void TestQPrefGeocoding::test_struct_get()
+{
+	// Test struct pref -> get func.
+
+	auto tst = qPrefGeocoding::instance();
+
+	prefs.geocoding.category[0] = TC_NONE;
+	prefs.geocoding.category[1] = TC_OCEAN;
+	prefs.geocoding.category[2] = TC_ADMIN_L1;
+
+	QCOMPARE(tst->first_taxonomy_category(), prefs.geocoding.category[0]);
+	QCOMPARE(tst->second_taxonomy_category(), prefs.geocoding.category[1]);
+	QCOMPARE(tst->third_taxonomy_category(), prefs.geocoding.category[2]);
+}
+
+void TestQPrefGeocoding::test_set_struct()
+{
+	// Test set func -> struct pref
+
+	auto tst = qPrefGeocoding::instance();
+
+	tst->set_first_taxonomy_category(TC_COUNTRY);
+	tst->set_second_taxonomy_category(TC_ADMIN_L1);
+	tst->set_third_taxonomy_category(TC_ADMIN_L2);
+
+	QCOMPARE(prefs.geocoding.category[0], TC_COUNTRY);
+	QCOMPARE(prefs.geocoding.category[1], TC_ADMIN_L1);
+	QCOMPARE(prefs.geocoding.category[2], TC_ADMIN_L2);
+}
+
+void TestQPrefGeocoding::test_set_load_struct()
+{
+	// test set func -> load -> struct pref
+
+	auto tst = qPrefGeocoding::instance();
+
+	tst->set_first_taxonomy_category(TC_LOCALNAME);
+	tst->set_second_taxonomy_category(TC_ADMIN_L3);
+	tst->set_third_taxonomy_category(TC_NR_CATEGORIES);
+
+	prefs.geocoding.category[0] = TC_NONE;
+	prefs.geocoding.category[1] = TC_OCEAN;
+	prefs.geocoding.category[2] = TC_ADMIN_L1;
+
+	tst->load();
+	QCOMPARE(prefs.geocoding.category[0], TC_LOCALNAME);
+	QCOMPARE(prefs.geocoding.category[1], TC_ADMIN_L3);
+	QCOMPARE(prefs.geocoding.category[2], TC_NR_CATEGORIES);
+}
+
+void TestQPrefGeocoding::test_struct_disk()
+{
+	// test struct prefs -> disk
+
+	auto tst = qPrefGeocoding::instance();
+
+	prefs.geocoding.category[0] = TC_NONE;
+	prefs.geocoding.category[1] = TC_OCEAN;
+	prefs.geocoding.category[2] = TC_ADMIN_L1;
+
+	tst->sync();
+	prefs.geocoding.category[0] = TC_ADMIN_L2;
+	prefs.geocoding.category[1] = TC_ADMIN_L2;
+	prefs.geocoding.category[2] = TC_ADMIN_L2;
+
+	tst->load();
+	QCOMPARE(prefs.geocoding.category[0], TC_NONE);
+	QCOMPARE(prefs.geocoding.category[1], TC_OCEAN);
+	QCOMPARE(prefs.geocoding.category[2], TC_ADMIN_L1);
+}
+
+void TestQPrefGeocoding::test_multiple()
+{
+	// test multiple instances have the same information
+
+	prefs.geocoding.category[0] = TC_NONE;
+	auto tst_direct = new qPrefGeocoding;
+
+	prefs.geocoding.category[1] = TC_OCEAN;
+	auto tst = qPrefGeocoding::instance();
+
+	QCOMPARE(tst->first_taxonomy_category(), tst_direct->first_taxonomy_category());
+	QCOMPARE(tst->second_taxonomy_category(), tst_direct->second_taxonomy_category());
+	QCOMPARE(tst->first_taxonomy_category(), TC_NONE);
+	QCOMPARE(tst->second_taxonomy_category(), TC_OCEAN);
+}
+
+QTEST_MAIN(TestQPrefGeocoding)
diff --git a/tests/testqPrefGeocoding.h b/tests/testqPrefGeocoding.h
new file mode 100644
index 000000000..bfd4605d6
--- /dev/null
+++ b/tests/testqPrefGeocoding.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0
+#ifndef TESTQPREFGEOCODING_H
+#define TESTQPREFGEOCODING_H
+
+#include <QObject>
+
+class TestQPrefGeocoding : public QObject {
+	Q_OBJECT
+
+private slots:
+	void initTestCase();
+	void test_struct_get();
+	void test_set_struct();
+	void test_set_load_struct();
+	void test_struct_disk();
+	void test_multiple();
+};
+
+#endif // TESTQPREFGEOCODING_H