diff --git a/Makefile.am b/Makefile.am
index 5b07837..e16d81d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ if USE_NLS
 po_SUBDIRS = po
 endif
 
-SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib x52cli utils daemon tests udev
+SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib x52cli x52test utils daemon tests udev
 
 # Extra files that need to be in the distribution
 EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index 400b237..5ae55d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ AC_CONFIG_FILES([ po/Makefile.in
     udev/60-saitek-x52-x52pro.rules
     utils/Makefile
     x52cli/Makefile
-    utils/test/Makefile
+    x52test/Makefile
     utils/evtest/Makefile
     daemon/Makefile
     tests/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b67b980..6b4d5cc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,11 +6,11 @@ libx52io/io_strings.c
 
 utils/evtest/ev_test.c
 
-utils/test/x52_test.c
-utils/test/x52_test_clock.c
-utils/test/x52_test_common.h
-utils/test/x52_test_led.c
-utils/test/x52_test_mfd.c
+x52test/x52_test.c
+x52test/x52_test_clock.c
+x52test/x52_test_common.h
+x52test/x52_test_led.c
+x52test/x52_test_mfd.c
 
 daemon/x52d_main.c
 daemon/x52d_clock.c
diff --git a/po/x52pro-linux.pot b/po/x52pro-linux.pot
index e88fb33..86d4b23 100644
--- a/po/x52pro-linux.pot
+++ b/po/x52pro-linux.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: x52pro-linux 0.2.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
-"POT-Creation-Date: 2021-07-29 21:50-0700\n"
+"POT-Creation-Date: 2021-07-29 22:12-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -255,239 +255,239 @@ msgstr ""
 msgid "Event @ %ld.%06ld: %s, value %d\n"
 msgstr ""
 
-#: utils/test/x52_test.c:97
+#: x52test/x52_test.c:97
 msgid "Test brightness scale (~ 1m)"
 msgstr ""
 
-#: utils/test/x52_test.c:98
+#: x52test/x52_test.c:98
 msgid "Test LED states (~ 45s)"
 msgstr ""
 
-#: utils/test/x52_test.c:99
+#: x52test/x52_test.c:99
 msgid "Test MFD string display (~ 30s)"
 msgstr ""
 
-#: utils/test/x52_test.c:100
+#: x52test/x52_test.c:100
 msgid "Test MFD displays all characters (~ 2m 15s)"
 msgstr ""
 
-#: utils/test/x52_test.c:101
+#: x52test/x52_test.c:101
 msgid "Test the blink and shift commands (< 10s)"
 msgstr ""
 
-#: utils/test/x52_test.c:102
+#: x52test/x52_test.c:102
 msgid "Test the clock commands (~1m)"
 msgstr ""
 
-#: utils/test/x52_test.c:126
+#: x52test/x52_test.c:126
 msgid ""
 "x52test is a suite of tests to write to the X52 Pro device\n"
 "and test the extra functionality available in the LEDs and MFD\n"
 msgstr ""
 
-#: utils/test/x52_test.c:130
+#: x52test/x52_test.c:130
 msgid "These tests take roughly 6 minutes to run"
 msgstr ""
 
-#: utils/test/x52_test.c:132
+#: x52test/x52_test.c:132
 msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime"
 msgstr ""
 
-#: utils/test/x52_test.c:138
+#: x52test/x52_test.c:138
 #, c-format
 msgid "Unable to initialize X52 library: %s\n"
 msgstr ""
 
-#: utils/test/x52_test.c:153
+#: x52test/x52_test.c:153
 msgid "All tests completed successfully"
 msgstr ""
 
-#: utils/test/x52_test.c:155
+#: x52test/x52_test.c:155
 #, c-format
 msgid "Got error %s\n"
 msgstr ""
 
-#: utils/test/x52_test.c:157
+#: x52test/x52_test.c:157
 #, c-format
 msgid "Received %s signal, quitting...\n"
 msgstr ""
 
-#: utils/test/x52_test.c:176
+#: x52test/x52_test.c:176
 msgid ""
 "These are the available tests with a description and\n"
 "approximate runtime. Not specifying any tests will run\n"
 "all the tests\n"
 msgstr ""
 
-#: utils/test/x52_test.c:180
+#: x52test/x52_test.c:180
 msgid "List of tests:"
 msgstr ""
 
-#: utils/test/x52_test.c:230
+#: x52test/x52_test.c:230
 #, c-format
 msgid ""
 "Usage: %s [list of tests]\n"
 "\n"
 msgstr ""
 
-#: utils/test/x52_test.c:244
+#: x52test/x52_test.c:244
 #, c-format
 msgid ""
 "Unrecognized test identifier: %s\n"
 "\n"
 msgstr ""
 
-#: utils/test/x52_test.c:257
+#: x52test/x52_test.c:257
 msgid "Not running any tests"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:32
+#: x52test/x52_test_clock.c:32
 msgid "Clock"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:33
+#: x52test/x52_test_clock.c:33
 msgid "This tests the clock display"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:38
+#: x52test/x52_test_clock.c:38
 msgid ""
 "\n"
 "Testing clock time minute display for 90 minutes"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:44
+#: x52test/x52_test_clock.c:44
 msgid ""
 "\n"
 "Testing clock time hour display for 36 hours, 12 hour mode"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:47
+#: x52test/x52_test_clock.c:47
 msgid ""
 "\n"
 "Testing clock time hour display for 36 hours, 24 hour mode"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:52
+#: x52test/x52_test_clock.c:52
 msgid ""
 "\n"
 "Testing clock date display for 31 days, dd-mm-yy"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:56
+#: x52test/x52_test_clock.c:56
 msgid ""
 "\n"
 "Testing clock date display for 31 days, mm-dd-yy"
 msgstr ""
 
-#: utils/test/x52_test_clock.c:60
+#: x52test/x52_test_clock.c:60
 msgid ""
 "\n"
 "Testing clock date display for 31 days, yy-mm-dd"
 msgstr ""
 
-#: utils/test/x52_test_common.h:26
+#: x52test/x52_test_common.h:26
 #, c-format
 msgid ""
 "\n"
 "%s(%s) failed with %d(%s)\n"
 msgstr ""
 
-#: utils/test/x52_test_common.h:32
+#: x52test/x52_test_common.h:32
 #, c-format
 msgid ""
 "\n"
 "update failed with %d(%s)\n"
 msgstr ""
 
-#: utils/test/x52_test_led.c:19
+#: x52test/x52_test_led.c:19
 #, c-format
 msgid "LED %s - %s\n"
 msgstr ""
 
-#: utils/test/x52_test_led.c:25 utils/test/x52_test_led.c:32
+#: x52test/x52_test_led.c:25 x52test/x52_test_led.c:32
 #, c-format
 msgid ""
 "\n"
 "Testing LED %s\n"
 msgstr ""
 
-#: utils/test/x52_test_led.c:42
+#: x52test/x52_test_led.c:42
 msgid "LEDs"
 msgstr ""
 
-#: utils/test/x52_test_led.c:48
+#: x52test/x52_test_led.c:48
 msgid "Skipping LED tests since the device does not support LED control"
 msgstr ""
 
-#: utils/test/x52_test_led.c:55
+#: x52test/x52_test_led.c:55
 msgid "This cycles the LEDs through all possible states"
 msgstr ""
 
-#: utils/test/x52_test_led.c:73
+#: x52test/x52_test_led.c:73
 #, c-format
 msgid ""
 "\n"
 "Testing %s\n"
 msgstr ""
 
-#: utils/test/x52_test_led.c:84
+#: x52test/x52_test_led.c:84
 msgid "Blink & Shift"
 msgstr ""
 
-#: utils/test/x52_test_led.c:85
+#: x52test/x52_test_led.c:85
 msgid "This tests the blink indicator and shift functionality"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:24
+#: x52test/x52_test_mfd.c:24
 msgid "Brightness"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:26
+#: x52test/x52_test_mfd.c:26
 msgid "This test cycles through the MFD and LED brightness scales"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:29
+#: x52test/x52_test_mfd.c:29
 msgid ""
 "\n"
 "MFD: "
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:36
+#: x52test/x52_test_mfd.c:36
 msgid ""
 "\n"
 "LED: "
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:55
+#: x52test/x52_test_mfd.c:55
 msgid "MFD text"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:56
+#: x52test/x52_test_mfd.c:56
 msgid "This test tests the character displays of the MFD\n"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:60
+#: x52test/x52_test_mfd.c:60
 #, c-format
 msgid "Writing characters %s\n"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:82
+#: x52test/x52_test_mfd.c:82
 msgid "MFD display"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:83
+#: x52test/x52_test_mfd.c:83
 msgid ""
 "This test checks if the display elements can display all characters\n"
 "You should see the display cycling through each character, with every\n"
 "cell displaying the same character\n"
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:88
+#: x52test/x52_test_mfd.c:88
 #, c-format
 msgid "Testing character 0x%02x..."
 msgstr ""
 
-#: utils/test/x52_test_mfd.c:96
+#: x52test/x52_test_mfd.c:96
 msgid "OK"
 msgstr ""
 
diff --git a/po/xx_PL.po b/po/xx_PL.po
index 12121dc..714021a 100644
--- a/po/xx_PL.po
+++ b/po/xx_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: x52pro-linux 0.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
-"POT-Creation-Date: 2021-07-29 21:50-0700\n"
+"POT-Creation-Date: 2021-07-29 22:12-0700\n"
 "PO-Revision-Date: 2021-07-27 02:08-0700\n"
 "Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n"
 "Language-Team: Dummy Language for testing i18n\n"
@@ -255,31 +255,31 @@ msgstr "Estingtay (interruptay otay exitay)\n"
 msgid "Event @ %ld.%06ld: %s, value %d\n"
 msgstr "Eventay @ %ld.%06ld: %s, aluevay %d\n"
 
-#: utils/test/x52_test.c:97
+#: x52test/x52_test.c:97
 msgid "Test brightness scale (~ 1m)"
 msgstr "Esttay ightnessbray alescay (~ 1m)"
 
-#: utils/test/x52_test.c:98
+#: x52test/x52_test.c:98
 msgid "Test LED states (~ 45s)"
 msgstr "Esstay EDLay atesstay (~ 45s)"
 
-#: utils/test/x52_test.c:99
+#: x52test/x52_test.c:99
 msgid "Test MFD string display (~ 30s)"
 msgstr "Esttay MFDay ingstray isplayday (~ 30s)"
 
-#: utils/test/x52_test.c:100
+#: x52test/x52_test.c:100
 msgid "Test MFD displays all characters (~ 2m 15s)"
 msgstr "Esttay MFDay isplaysday allay aracterschay (~ 2m 15s)"
 
-#: utils/test/x52_test.c:101
+#: x52test/x52_test.c:101
 msgid "Test the blink and shift commands (< 10s)"
 msgstr "Esttay ethay inkblay anday iftshay ommandscay (< 10s)"
 
-#: utils/test/x52_test.c:102
+#: x52test/x52_test.c:102
 msgid "Test the clock commands (~1m)"
 msgstr "Esttay ethay ockclay ommandscay (~1m)"
 
-#: utils/test/x52_test.c:126
+#: x52test/x52_test.c:126
 msgid ""
 "x52test is a suite of tests to write to the X52 Pro device\n"
 "and test the extra functionality available in the LEDs and MFD\n"
@@ -288,36 +288,36 @@ msgstr ""
 "X52 Pro eviceday anday esttay ethay extray unctionalityfay\n"
 "availableay inay ethay EDsLay anday FDMay\n"
 
-#: utils/test/x52_test.c:130
+#: x52test/x52_test.c:130
 msgid "These tests take roughly 6 minutes to run"
 msgstr "Esethay eststay aketay oughlyray 6 inutesmay otay unray"
 
-#: utils/test/x52_test.c:132
+#: x52test/x52_test.c:132
 msgid "Press Enter to begin the tests, press Ctrl-C to abort anytime"
 msgstr ""
 "Esspray Enteray otay eginbay ethay eststay, esspray Ctrl-C otay abortay "
 "anytimeay"
 
-#: utils/test/x52_test.c:138
+#: x52test/x52_test.c:138
 #, c-format
 msgid "Unable to initialize X52 library: %s\n"
 msgstr "Unableay otay initializeay X52 ibrarylay: %s\n"
 
-#: utils/test/x52_test.c:153
+#: x52test/x52_test.c:153
 msgid "All tests completed successfully"
 msgstr "Allay eststay ompletedcay uccessfullysay"
 
-#: utils/test/x52_test.c:155
+#: x52test/x52_test.c:155
 #, c-format
 msgid "Got error %s\n"
 msgstr "Otgay erroray %s\n"
 
-#: utils/test/x52_test.c:157
+#: x52test/x52_test.c:157
 #, c-format
 msgid "Received %s signal, quitting...\n"
 msgstr "Eceivedray %s ignalsay, uittingqay...\n"
 
-#: utils/test/x52_test.c:176
+#: x52test/x52_test.c:176
 msgid ""
 "These are the available tests with a description and\n"
 "approximate runtime. Not specifying any tests will run\n"
@@ -328,18 +328,18 @@ msgstr ""
 "ecifyingspay anyay eststay illway unray allay ethay\n"
 "eststay\n"
 
-#: utils/test/x52_test.c:180
+#: x52test/x52_test.c:180
 msgid "List of tests:"
 msgstr "Istlay ofay eststay:"
 
-#: utils/test/x52_test.c:230
+#: x52test/x52_test.c:230
 #, c-format
 msgid ""
 "Usage: %s [list of tests]\n"
 "\n"
 msgstr "Usageay: %s [istlay ofay eststay]\n"
 
-#: utils/test/x52_test.c:244
+#: x52test/x52_test.c:244
 #, c-format
 msgid ""
 "Unrecognized test identifier: %s\n"
@@ -348,19 +348,19 @@ msgstr ""
 "Unrecognizeday esttay identifieray: %s\n"
 "\n"
 
-#: utils/test/x52_test.c:257
+#: x52test/x52_test.c:257
 msgid "Not running any tests"
 msgstr "Otnay unningray anyay eststay"
 
-#: utils/test/x52_test_clock.c:32
+#: x52test/x52_test_clock.c:32
 msgid "Clock"
 msgstr "Ockclay"
 
-#: utils/test/x52_test_clock.c:33
+#: x52test/x52_test_clock.c:33
 msgid "This tests the clock display"
 msgstr "Isthay eststay ethay ockclay isplayday"
 
-#: utils/test/x52_test_clock.c:38
+#: x52test/x52_test_clock.c:38
 msgid ""
 "\n"
 "Testing clock time minute display for 90 minutes"
@@ -368,7 +368,7 @@ msgstr ""
 "\n"
 "Estingtay ockclay imetay inutemay isplayday orfay 90 inutesmay"
 
-#: utils/test/x52_test_clock.c:44
+#: x52test/x52_test_clock.c:44
 msgid ""
 "\n"
 "Testing clock time hour display for 36 hours, 12 hour mode"
@@ -376,7 +376,7 @@ msgstr ""
 "\n"
 "Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 12 ourhay odemay"
 
-#: utils/test/x52_test_clock.c:47
+#: x52test/x52_test_clock.c:47
 msgid ""
 "\n"
 "Testing clock time hour display for 36 hours, 24 hour mode"
@@ -384,7 +384,7 @@ msgstr ""
 "\n"
 "Estingtay ockclay imetay ourhay isplayday orfay 36 ourshay, 24 ourhay odemay"
 
-#: utils/test/x52_test_clock.c:52
+#: x52test/x52_test_clock.c:52
 msgid ""
 "\n"
 "Testing clock date display for 31 days, dd-mm-yy"
@@ -392,7 +392,7 @@ msgstr ""
 "\n"
 "Estingtay ockclay ateday isplayday orfay 31 aysday, dd-mm-yy"
 
-#: utils/test/x52_test_clock.c:56
+#: x52test/x52_test_clock.c:56
 msgid ""
 "\n"
 "Testing clock date display for 31 days, mm-dd-yy"
@@ -400,7 +400,7 @@ msgstr ""
 "\n"
 "Estingtay ockclay ateday isplayday orfay 31 aysday, mm-dd-yy"
 
-#: utils/test/x52_test_clock.c:60
+#: x52test/x52_test_clock.c:60
 msgid ""
 "\n"
 "Testing clock date display for 31 days, yy-mm-dd"
@@ -408,7 +408,7 @@ msgstr ""
 "\n"
 "Estingtay ockclay ateday isplayday orfay 31 aysday, yy-mm-dd"
 
-#: utils/test/x52_test_common.h:26
+#: x52test/x52_test_common.h:26
 #, c-format
 msgid ""
 "\n"
@@ -417,7 +417,7 @@ msgstr ""
 "\n"
 "%s(%s) ailedfay ithway %d(%s)\n"
 
-#: utils/test/x52_test_common.h:32
+#: x52test/x52_test_common.h:32
 #, c-format
 msgid ""
 "\n"
@@ -426,12 +426,12 @@ msgstr ""
 "\n"
 "updateay ailedfay ithway %d(%s)\n"
 
-#: utils/test/x52_test_led.c:19
+#: x52test/x52_test_led.c:19
 #, c-format
 msgid "LED %s - %s\n"
 msgstr "EDLay %s - %s\n"
 
-#: utils/test/x52_test_led.c:25 utils/test/x52_test_led.c:32
+#: x52test/x52_test_led.c:25 x52test/x52_test_led.c:32
 #, c-format
 msgid ""
 "\n"
@@ -440,21 +440,21 @@ msgstr ""
 "\n"
 "Estingtay EDLay %s\n"
 
-#: utils/test/x52_test_led.c:42
+#: x52test/x52_test_led.c:42
 msgid "LEDs"
 msgstr "EDsLay"
 
-#: utils/test/x52_test_led.c:48
+#: x52test/x52_test_led.c:48
 msgid "Skipping LED tests since the device does not support LED control"
 msgstr ""
 "Ippingskay EDLay eststay incesay ethay eviceday oesday otnay\n"
 "upportsay EDLay ontrolcay"
 
-#: utils/test/x52_test_led.c:55
+#: x52test/x52_test_led.c:55
 msgid "This cycles the LEDs through all possible states"
 msgstr "Isthay yclescay ethay EDsLay oughthray allay ossiblepay tatessay"
 
-#: utils/test/x52_test_led.c:73
+#: x52test/x52_test_led.c:73
 #, c-format
 msgid ""
 "\n"
@@ -463,25 +463,25 @@ msgstr ""
 "\n"
 "Estingtay %s\n"
 
-#: utils/test/x52_test_led.c:84
+#: x52test/x52_test_led.c:84
 msgid "Blink & Shift"
 msgstr "Inkblay & Iftshay"
 
-#: utils/test/x52_test_led.c:85
+#: x52test/x52_test_led.c:85
 msgid "This tests the blink indicator and shift functionality"
 msgstr "Isthay eststay ethay inkblay indicatoray anday iftshay unctionalityfay"
 
-#: utils/test/x52_test_mfd.c:24
+#: x52test/x52_test_mfd.c:24
 msgid "Brightness"
 msgstr "Ightnessbray"
 
-#: utils/test/x52_test_mfd.c:26
+#: x52test/x52_test_mfd.c:26
 msgid "This test cycles through the MFD and LED brightness scales"
 msgstr ""
 "Isthay esttay yclescay oughthray ethay FDMay anday EDLay ightnessbray "
 "alesscay"
 
-#: utils/test/x52_test_mfd.c:29
+#: x52test/x52_test_mfd.c:29
 msgid ""
 "\n"
 "MFD: "
@@ -489,7 +489,7 @@ msgstr ""
 "\n"
 "FDMay: "
 
-#: utils/test/x52_test_mfd.c:36
+#: x52test/x52_test_mfd.c:36
 msgid ""
 "\n"
 "LED: "
@@ -497,24 +497,24 @@ msgstr ""
 "\n"
 "EDLay: "
 
-#: utils/test/x52_test_mfd.c:55
+#: x52test/x52_test_mfd.c:55
 msgid "MFD text"
 msgstr "FDMay exttay"
 
-#: utils/test/x52_test_mfd.c:56
+#: x52test/x52_test_mfd.c:56
 msgid "This test tests the character displays of the MFD\n"
 msgstr "Isthay esttay eststay ethay aracterchay isplaysday ofay the FDMay\n"
 
-#: utils/test/x52_test_mfd.c:60
+#: x52test/x52_test_mfd.c:60
 #, c-format
 msgid "Writing characters %s\n"
 msgstr "Itingwray aracterschay %s\n"
 
-#: utils/test/x52_test_mfd.c:82
+#: x52test/x52_test_mfd.c:82
 msgid "MFD display"
 msgstr "FDMay isplayday"
 
-#: utils/test/x52_test_mfd.c:83
+#: x52test/x52_test_mfd.c:83
 msgid ""
 "This test checks if the display elements can display all characters\n"
 "You should see the display cycling through each character, with every\n"
@@ -525,12 +525,12 @@ msgstr ""
 "oughthray eachay aracterchay, ithway everyay ellcay isplayingday ethay\n"
 "amesay aracterchay\n"
 
-#: utils/test/x52_test_mfd.c:88
+#: x52test/x52_test_mfd.c:88
 #, c-format
 msgid "Testing character 0x%02x..."
 msgstr "Estingtay aracterchay 0x%02x..."
 
-#: utils/test/x52_test_mfd.c:96
+#: x52test/x52_test_mfd.c:96
 msgid "OK"
 msgstr "OKay"
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index e481390..50202dc 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -4,5 +4,5 @@
 #
 # SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
 
-SUBDIRS = test evtest
+SUBDIRS = evtest
 
diff --git a/utils/test/Makefile.am b/x52test/Makefile.am
similarity index 93%
rename from utils/test/Makefile.am
rename to x52test/Makefile.am
index d93be98..a11f409 100644
--- a/utils/test/Makefile.am
+++ b/x52test/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = x52test
 x52test_SOURCES = x52_test.c x52_test_mfd.c x52_test_led.c x52_test_clock.c
 x52test_CFLAGS = -I $(top_srcdir)/libx52 -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS)
 x52test_LDFLAGS = $(WARN_LDFLAGS)
-x52test_LDADD = ../../libx52/libx52.la
+x52test_LDADD = ../libx52/libx52.la
 
 # Extra files that need to be in the distribution
 EXTRA_DIST = x52_test_common.h
diff --git a/utils/test/x52_test.c b/x52test/x52_test.c
similarity index 100%
rename from utils/test/x52_test.c
rename to x52test/x52_test.c
diff --git a/utils/test/x52_test_clock.c b/x52test/x52_test_clock.c
similarity index 100%
rename from utils/test/x52_test_clock.c
rename to x52test/x52_test_clock.c
diff --git a/utils/test/x52_test_common.h b/x52test/x52_test_common.h
similarity index 100%
rename from utils/test/x52_test_common.h
rename to x52test/x52_test_common.h
diff --git a/utils/test/x52_test_led.c b/x52test/x52_test_led.c
similarity index 100%
rename from utils/test/x52_test_led.c
rename to x52test/x52_test_led.c
diff --git a/utils/test/x52_test_mfd.c b/x52test/x52_test_mfd.c
similarity index 100%
rename from utils/test/x52_test_mfd.c
rename to x52test/x52_test_mfd.c