diff --git a/test/tst_lfqueue.cpp b/test/tst_lfqueue.cpp
index 1120de5..4343f47 100644
--- a/test/tst_lfqueue.cpp
+++ b/test/tst_lfqueue.cpp
@@ -1,19 +1,10 @@
-#include <QtTest/QtTest>
+#include <QtTest>
+
 #include <QtConcurrent/qtconcurrentrun.h>
 
-#include "lfqueue.h"
+#include "utils/lfqueue.h"
+#include "tst_lfqueue.h"
 
-class TestLFQueue: public QObject
-{
-    Q_OBJECT
-private:
-
-private slots:
-    void setSize_data();
-    void setSize();
-    void exchange_data();
-    void exchange();
-};
 
 
 void TestLFQueue::setSize_data()
@@ -92,7 +83,3 @@ void TestLFQueue::exchange()
 
     thread.waitForFinished();
 }
-
-
-QTEST_MAIN(TestLFQueue)
-#include "tst_lfqueue.moc"
diff --git a/test/tst_lfqueue.h b/test/tst_lfqueue.h
index 19ee4cf..315bf75 100644
--- a/test/tst_lfqueue.h
+++ b/test/tst_lfqueue.h
@@ -1,4 +1,18 @@
 #ifndef TST_LFQUEUE_H
 #define TST_LFQUEUE_H
 
+#include <QObject>
+
+class TestLFQueue: public QObject
+{
+    Q_OBJECT
+private:
+
+private slots:
+    void setSize_data();
+    void setSize();
+    void exchange_data();
+    void exchange();
+};
+
 #endif // TST_LFQUEUE_H