diff --git a/charts.pro b/charts.pro
index e245ba9..48984ba 100644
--- a/charts.pro
+++ b/charts.pro
@@ -3,7 +3,7 @@
 }
 
 TEMPLATE = subdirs
-SUBDIRS = src plugins examples demos test
+SUBDIRS = src plugins examples demos tests
 
 development_build: message('Development build')
 
diff --git a/test/auto/auto.pri b/tests/auto/auto.pri
similarity index 81%
rename from test/auto/auto.pri
rename to tests/auto/auto.pri
index b1bb78e..71d26a6 100644
--- a/test/auto/auto.pri
+++ b/tests/auto/auto.pri
@@ -1,5 +1,5 @@
-!include( ../test.pri ) {
-    error( "Couldn't find the test.pri file!" )
+!include( ../tests.pri ) {
+    error( "Couldn't find the tests.pri file!" )
 }
 
 CONFIG  += qtestlib
diff --git a/test/auto/auto.pro b/tests/auto/auto.pro
similarity index 77%
rename from test/auto/auto.pro
rename to tests/auto/auto.pro
index b75f77a..d834162 100644
--- a/test/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,5 +1,5 @@
-!include( ../test.pri ) {
- error( "Couldn't find the test.pri file!" )
+!include( ../tests.pri ) {
+ error( "Couldn't find the tests.pri file!" )
 }
 
 TEMPLATE = subdirs
diff --git a/test/auto/chartdataset/chartdataset.pro b/tests/auto/chartdataset/chartdataset.pro
similarity index 100%
rename from test/auto/chartdataset/chartdataset.pro
rename to tests/auto/chartdataset/chartdataset.pro
diff --git a/test/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp
similarity index 100%
rename from test/auto/chartdataset/tst_chartdataset.cpp
rename to tests/auto/chartdataset/tst_chartdataset.cpp
diff --git a/test/auto/domain/domain.pro b/tests/auto/domain/domain.pro
similarity index 100%
rename from test/auto/domain/domain.pro
rename to tests/auto/domain/domain.pro
diff --git a/test/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp
similarity index 100%
rename from test/auto/domain/tst_domain.cpp
rename to tests/auto/domain/tst_domain.cpp
diff --git a/test/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h
similarity index 100%
rename from test/auto/inc/tst_definitions.h
rename to tests/auto/inc/tst_definitions.h
diff --git a/test/auto/qbarseries/qbarseries.pro b/tests/auto/qbarseries/qbarseries.pro
similarity index 100%
rename from test/auto/qbarseries/qbarseries.pro
rename to tests/auto/qbarseries/qbarseries.pro
diff --git a/test/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
similarity index 100%
rename from test/auto/qbarseries/tst_qbarseries.cpp
rename to tests/auto/qbarseries/tst_qbarseries.cpp
diff --git a/test/auto/qbarset/qbarset.pro b/tests/auto/qbarset/qbarset.pro
similarity index 100%
rename from test/auto/qbarset/qbarset.pro
rename to tests/auto/qbarset/qbarset.pro
diff --git a/test/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
similarity index 100%
rename from test/auto/qbarset/tst_qbarset.cpp
rename to tests/auto/qbarset/tst_qbarset.cpp
diff --git a/test/auto/qchart/qchart.pro b/tests/auto/qchart/qchart.pro
similarity index 100%
rename from test/auto/qchart/qchart.pro
rename to tests/auto/qchart/qchart.pro
diff --git a/test/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
similarity index 100%
rename from test/auto/qchart/tst_qchart.cpp
rename to tests/auto/qchart/tst_qchart.cpp
diff --git a/test/auto/qchartview/qchartview.pro b/tests/auto/qchartview/qchartview.pro
similarity index 100%
rename from test/auto/qchartview/qchartview.pro
rename to tests/auto/qchartview/qchartview.pro
diff --git a/test/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
similarity index 100%
rename from test/auto/qchartview/tst_qchartview.cpp
rename to tests/auto/qchartview/tst_qchartview.cpp
diff --git a/test/auto/qgroupedbarseries/qgroupedbarseries.pro b/tests/auto/qgroupedbarseries/qgroupedbarseries.pro
similarity index 100%
rename from test/auto/qgroupedbarseries/qgroupedbarseries.pro
rename to tests/auto/qgroupedbarseries/qgroupedbarseries.pro
diff --git a/test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp b/tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp
similarity index 100%
rename from test/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp
rename to tests/auto/qgroupedbarseries/tst_qgroupedbarseries.cpp
diff --git a/test/auto/qlineseries/qlineseries.pro b/tests/auto/qlineseries/qlineseries.pro
similarity index 100%
rename from test/auto/qlineseries/qlineseries.pro
rename to tests/auto/qlineseries/qlineseries.pro
diff --git a/test/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp
similarity index 100%
rename from test/auto/qlineseries/tst_qlineseries.cpp
rename to tests/auto/qlineseries/tst_qlineseries.cpp
diff --git a/test/auto/qpercentbarseries/qpercentbarseries.pro b/tests/auto/qpercentbarseries/qpercentbarseries.pro
similarity index 100%
rename from test/auto/qpercentbarseries/qpercentbarseries.pro
rename to tests/auto/qpercentbarseries/qpercentbarseries.pro
diff --git a/test/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
similarity index 100%
rename from test/auto/qpercentbarseries/tst_qpercentbarseries.cpp
rename to tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
diff --git a/test/auto/qpieseries/qpieseries.pro b/tests/auto/qpieseries/qpieseries.pro
similarity index 100%
rename from test/auto/qpieseries/qpieseries.pro
rename to tests/auto/qpieseries/qpieseries.pro
diff --git a/test/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp
similarity index 100%
rename from test/auto/qpieseries/tst_qpieseries.cpp
rename to tests/auto/qpieseries/tst_qpieseries.cpp
diff --git a/test/auto/qpieslice/qpieslice.pro b/tests/auto/qpieslice/qpieslice.pro
similarity index 100%
rename from test/auto/qpieslice/qpieslice.pro
rename to tests/auto/qpieslice/qpieslice.pro
diff --git a/test/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp
similarity index 100%
rename from test/auto/qpieslice/tst_qpieslice.cpp
rename to tests/auto/qpieslice/tst_qpieslice.cpp
diff --git a/test/auto/qstackedbarseries/qstackedbarseries.pro b/tests/auto/qstackedbarseries/qstackedbarseries.pro
similarity index 100%
rename from test/auto/qstackedbarseries/qstackedbarseries.pro
rename to tests/auto/qstackedbarseries/qstackedbarseries.pro
diff --git a/test/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
similarity index 100%
rename from test/auto/qstackedbarseries/tst_qstackedbarseries.cpp
rename to tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
diff --git a/test/chartdesigner/brushwidget.cpp b/tests/chartdesigner/brushwidget.cpp
similarity index 100%
rename from test/chartdesigner/brushwidget.cpp
rename to tests/chartdesigner/brushwidget.cpp
diff --git a/test/chartdesigner/brushwidget.h b/tests/chartdesigner/brushwidget.h
similarity index 100%
rename from test/chartdesigner/brushwidget.h
rename to tests/chartdesigner/brushwidget.h
diff --git a/test/chartdesigner/chartdesigner.pro b/tests/chartdesigner/chartdesigner.pro
similarity index 95%
rename from test/chartdesigner/chartdesigner.pro
rename to tests/chartdesigner/chartdesigner.pro
index 3b53646..0594b37 100644
--- a/test/chartdesigner/chartdesigner.pro
+++ b/tests/chartdesigner/chartdesigner.pro
@@ -1,4 +1,4 @@
-!include( ../test.pri ) {
+!include( ../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 
diff --git a/test/chartdesigner/engine.cpp b/tests/chartdesigner/engine.cpp
similarity index 100%
rename from test/chartdesigner/engine.cpp
rename to tests/chartdesigner/engine.cpp
diff --git a/test/chartdesigner/engine.h b/tests/chartdesigner/engine.h
similarity index 100%
rename from test/chartdesigner/engine.h
rename to tests/chartdesigner/engine.h
diff --git a/test/chartdesigner/main.cpp b/tests/chartdesigner/main.cpp
similarity index 100%
rename from test/chartdesigner/main.cpp
rename to tests/chartdesigner/main.cpp
diff --git a/test/chartdesigner/mainwindow.cpp b/tests/chartdesigner/mainwindow.cpp
similarity index 100%
rename from test/chartdesigner/mainwindow.cpp
rename to tests/chartdesigner/mainwindow.cpp
diff --git a/test/chartdesigner/mainwindow.h b/tests/chartdesigner/mainwindow.h
similarity index 100%
rename from test/chartdesigner/mainwindow.h
rename to tests/chartdesigner/mainwindow.h
diff --git a/test/chartdesigner/objectinspectorwidget.cpp b/tests/chartdesigner/objectinspectorwidget.cpp
similarity index 100%
rename from test/chartdesigner/objectinspectorwidget.cpp
rename to tests/chartdesigner/objectinspectorwidget.cpp
diff --git a/test/chartdesigner/objectinspectorwidget.h b/tests/chartdesigner/objectinspectorwidget.h
similarity index 100%
rename from test/chartdesigner/objectinspectorwidget.h
rename to tests/chartdesigner/objectinspectorwidget.h
diff --git a/test/chartdesigner/penwidget.cpp b/tests/chartdesigner/penwidget.cpp
similarity index 100%
rename from test/chartdesigner/penwidget.cpp
rename to tests/chartdesigner/penwidget.cpp
diff --git a/test/chartdesigner/penwidget.h b/tests/chartdesigner/penwidget.h
similarity index 100%
rename from test/chartdesigner/penwidget.h
rename to tests/chartdesigner/penwidget.h
diff --git a/test/chartwidgettest/chartwidgettest.pro b/tests/chartwidgettest/chartwidgettest.pro
similarity index 93%
rename from test/chartwidgettest/chartwidgettest.pro
rename to tests/chartwidgettest/chartwidgettest.pro
index 2005a55..4531c56 100644
--- a/test/chartwidgettest/chartwidgettest.pro
+++ b/tests/chartwidgettest/chartwidgettest.pro
@@ -1,4 +1,4 @@
-!include( ../test.pri ) {
+!include( ../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 
diff --git a/test/chartwidgettest/dataseriedialog.cpp b/tests/chartwidgettest/dataseriedialog.cpp
similarity index 100%
rename from test/chartwidgettest/dataseriedialog.cpp
rename to tests/chartwidgettest/dataseriedialog.cpp
diff --git a/test/chartwidgettest/dataseriedialog.h b/tests/chartwidgettest/dataseriedialog.h
similarity index 100%
rename from test/chartwidgettest/dataseriedialog.h
rename to tests/chartwidgettest/dataseriedialog.h
diff --git a/test/chartwidgettest/main.cpp b/tests/chartwidgettest/main.cpp
similarity index 100%
rename from test/chartwidgettest/main.cpp
rename to tests/chartwidgettest/main.cpp
diff --git a/test/chartwidgettest/mainwidget.cpp b/tests/chartwidgettest/mainwidget.cpp
similarity index 100%
rename from test/chartwidgettest/mainwidget.cpp
rename to tests/chartwidgettest/mainwidget.cpp
diff --git a/test/chartwidgettest/mainwidget.h b/tests/chartwidgettest/mainwidget.h
similarity index 100%
rename from test/chartwidgettest/mainwidget.h
rename to tests/chartwidgettest/mainwidget.h
diff --git a/test/gdpbarchart/gdpData b/tests/gdpbarchart/gdpData
similarity index 100%
rename from test/gdpbarchart/gdpData
rename to tests/gdpbarchart/gdpData
Binary files a/test/gdpbarchart/gdpData and b/tests/gdpbarchart/gdpData differ
diff --git a/test/gdpbarchart/gdpbarchart.pro b/tests/gdpbarchart/gdpbarchart.pro
similarity index 94%
rename from test/gdpbarchart/gdpbarchart.pro
rename to tests/gdpbarchart/gdpbarchart.pro
index 61b38a9..0dc534c 100644
--- a/test/gdpbarchart/gdpbarchart.pro
+++ b/tests/gdpbarchart/gdpbarchart.pro
@@ -1,4 +1,4 @@
-!include( ../test.pri ) {
+!include( ../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 
diff --git a/test/gdpbarchart/main.cpp b/tests/gdpbarchart/main.cpp
similarity index 100%
rename from test/gdpbarchart/main.cpp
rename to tests/gdpbarchart/main.cpp
diff --git a/test/gdpbarchart/widget.cpp b/tests/gdpbarchart/widget.cpp
similarity index 100%
rename from test/gdpbarchart/widget.cpp
rename to tests/gdpbarchart/widget.cpp
diff --git a/test/gdpbarchart/widget.h b/tests/gdpbarchart/widget.h
similarity index 100%
rename from test/gdpbarchart/widget.h
rename to tests/gdpbarchart/widget.h
diff --git a/test/scripts/Jobs.pm b/tests/scripts/Jobs.pm
similarity index 100%
rename from test/scripts/Jobs.pm
rename to tests/scripts/Jobs.pm
diff --git a/test/scripts/Tiny.pm b/tests/scripts/Tiny.pm
similarity index 100%
rename from test/scripts/Tiny.pm
rename to tests/scripts/Tiny.pm
diff --git a/test/scripts/build.pl b/tests/scripts/build.pl
similarity index 100%
rename from test/scripts/build.pl
rename to tests/scripts/build.pl
diff --git a/test/scripts/build_win_mingw.bat b/tests/scripts/build_win_mingw.bat
similarity index 100%
rename from test/scripts/build_win_mingw.bat
rename to tests/scripts/build_win_mingw.bat
diff --git a/test/scripts/build_win_vs2005.bat b/tests/scripts/build_win_vs2005.bat
similarity index 100%
rename from test/scripts/build_win_vs2005.bat
rename to tests/scripts/build_win_vs2005.bat
diff --git a/test/scripts/build_win_vs2008.bat b/tests/scripts/build_win_vs2008.bat
similarity index 100%
rename from test/scripts/build_win_vs2008.bat
rename to tests/scripts/build_win_vs2008.bat
diff --git a/test/scripts/build_win_vs2010.bat b/tests/scripts/build_win_vs2010.bat
similarity index 100%
rename from test/scripts/build_win_vs2010.bat
rename to tests/scripts/build_win_vs2010.bat
diff --git a/test/scripts/build_win_vs2010_64bit.bat b/tests/scripts/build_win_vs2010_64bit.bat
similarity index 100%
rename from test/scripts/build_win_vs2010_64bit.bat
rename to tests/scripts/build_win_vs2010_64bit.bat
diff --git a/test/scripts/execute_tst.perl b/tests/scripts/execute_tst.perl
similarity index 100%
rename from test/scripts/execute_tst.perl
rename to tests/scripts/execute_tst.perl
diff --git a/test/scripts/jobs.ini b/tests/scripts/jobs.ini
similarity index 100%
rename from test/scripts/jobs.ini
rename to tests/scripts/jobs.ini
diff --git a/test/scripts/run_tests.pl b/tests/scripts/run_tests.pl
similarity index 100%
rename from test/scripts/run_tests.pl
rename to tests/scripts/run_tests.pl
diff --git a/test/tablemodelchart/customtablemodel.cpp b/tests/tablemodelchart/customtablemodel.cpp
similarity index 100%
rename from test/tablemodelchart/customtablemodel.cpp
rename to tests/tablemodelchart/customtablemodel.cpp
diff --git a/test/tablemodelchart/customtablemodel.h b/tests/tablemodelchart/customtablemodel.h
similarity index 100%
rename from test/tablemodelchart/customtablemodel.h
rename to tests/tablemodelchart/customtablemodel.h
diff --git a/test/tablemodelchart/main.cpp b/tests/tablemodelchart/main.cpp
similarity index 100%
rename from test/tablemodelchart/main.cpp
rename to tests/tablemodelchart/main.cpp
diff --git a/test/tablemodelchart/tablemodelchart.pro b/tests/tablemodelchart/tablemodelchart.pro
similarity index 92%
rename from test/tablemodelchart/tablemodelchart.pro
rename to tests/tablemodelchart/tablemodelchart.pro
index 086d607..25432b8 100644
--- a/test/tablemodelchart/tablemodelchart.pro
+++ b/tests/tablemodelchart/tablemodelchart.pro
@@ -1,4 +1,4 @@
-!include( ../test.pri ) {
+!include( ../tests.pri ) {
     error( "Couldn't find the test.pri file!" )
 }
 
diff --git a/test/tablemodelchart/tablewidget.cpp b/tests/tablemodelchart/tablewidget.cpp
similarity index 100%
rename from test/tablemodelchart/tablewidget.cpp
rename to tests/tablemodelchart/tablewidget.cpp
diff --git a/test/tablemodelchart/tablewidget.h b/tests/tablemodelchart/tablewidget.h
similarity index 100%
rename from test/tablemodelchart/tablewidget.h
rename to tests/tablemodelchart/tablewidget.h
diff --git a/test/test.pri b/tests/tests.pri
similarity index 100%
rename from test/test.pri
rename to tests/tests.pri
diff --git a/test/test.pro b/tests/tests.pro
similarity index 100%
rename from test/test.pro
rename to tests/tests.pro
diff --git a/test/wavechart/main.cpp b/tests/wavechart/main.cpp
similarity index 100%
rename from test/wavechart/main.cpp
rename to tests/wavechart/main.cpp
diff --git a/test/wavechart/wavechart.cpp b/tests/wavechart/wavechart.cpp
similarity index 100%
rename from test/wavechart/wavechart.cpp
rename to tests/wavechart/wavechart.cpp
diff --git a/test/wavechart/wavechart.h b/tests/wavechart/wavechart.h
similarity index 100%
rename from test/wavechart/wavechart.h
rename to tests/wavechart/wavechart.h
diff --git a/test/wavechart/wavechart.pro b/tests/wavechart/wavechart.pro
similarity index 88%
rename from test/wavechart/wavechart.pro
rename to tests/wavechart/wavechart.pro
index a506452..b89e19d 100644
--- a/test/wavechart/wavechart.pro
+++ b/tests/wavechart/wavechart.pro
@@ -1,4 +1,4 @@
-!include( ../test.pri ) {
+!include( ../tests.pri ) {
  error( "Couldn't find the examples.pri file!" )
 }
 QT+=opengl