diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a57f5bb6..59c7e38a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="./tests/common/bootstrap.php"
+         bootstrap="./test/bootstrap.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/tests/PHPWord/AutoloaderTest.php b/test/PhpWord/AutoloaderTest.php
similarity index 100%
rename from tests/PHPWord/AutoloaderTest.php
rename to test/PhpWord/AutoloaderTest.php
diff --git a/tests/PhpWord/DocumentPropertiesTest.php b/test/PhpWord/DocumentPropertiesTest.php
similarity index 100%
rename from tests/PhpWord/DocumentPropertiesTest.php
rename to test/PhpWord/DocumentPropertiesTest.php
diff --git a/tests/PhpWord/Exceptions/ExceptionTest.php b/test/PhpWord/Exceptions/ExceptionTest.php
similarity index 100%
rename from tests/PhpWord/Exceptions/ExceptionTest.php
rename to test/PhpWord/Exceptions/ExceptionTest.php
diff --git a/tests/PhpWord/Exceptions/InvalidImageExceptionTest.php b/test/PhpWord/Exceptions/InvalidImageExceptionTest.php
similarity index 100%
rename from tests/PhpWord/Exceptions/InvalidImageExceptionTest.php
rename to test/PhpWord/Exceptions/InvalidImageExceptionTest.php
diff --git a/tests/PhpWord/Exceptions/InvalidStyleExceptionTest.php b/test/PhpWord/Exceptions/InvalidStyleExceptionTest.php
similarity index 100%
rename from tests/PhpWord/Exceptions/InvalidStyleExceptionTest.php
rename to test/PhpWord/Exceptions/InvalidStyleExceptionTest.php
diff --git a/tests/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php b/test/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php
similarity index 100%
rename from tests/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php
rename to test/PhpWord/Exceptions/UnsupportedImageTypeExceptionTest.php
diff --git a/tests/PHPWord/IOFactoryTest.php b/test/PhpWord/IOFactoryTest.php
similarity index 100%
rename from tests/PHPWord/IOFactoryTest.php
rename to test/PhpWord/IOFactoryTest.php
diff --git a/tests/PHPWord/MediaTest.php b/test/PhpWord/MediaTest.php
similarity index 100%
rename from tests/PHPWord/MediaTest.php
rename to test/PhpWord/MediaTest.php
diff --git a/tests/PHPWord/PhpWordTest.php b/test/PhpWord/PhpWordTest.php
similarity index 100%
rename from tests/PHPWord/PhpWordTest.php
rename to test/PhpWord/PhpWordTest.php
diff --git a/tests/PHPWord/Reader/Word2007Test.php b/test/PhpWord/Reader/Word2007Test.php
similarity index 100%
rename from tests/PHPWord/Reader/Word2007Test.php
rename to test/PhpWord/Reader/Word2007Test.php
diff --git a/tests/PhpWord/Section/Footer/PreserveTextTest.php b/test/PhpWord/Section/Footer/PreserveTextTest.php
similarity index 100%
rename from tests/PhpWord/Section/Footer/PreserveTextTest.php
rename to test/PhpWord/Section/Footer/PreserveTextTest.php
diff --git a/tests/PhpWord/Section/FooterTest.php b/test/PhpWord/Section/FooterTest.php
similarity index 100%
rename from tests/PhpWord/Section/FooterTest.php
rename to test/PhpWord/Section/FooterTest.php
diff --git a/tests/PhpWord/Section/FootnoteTest.php b/test/PhpWord/Section/FootnoteTest.php
similarity index 100%
rename from tests/PhpWord/Section/FootnoteTest.php
rename to test/PhpWord/Section/FootnoteTest.php
diff --git a/tests/PhpWord/Section/HeaderTest.php b/test/PhpWord/Section/HeaderTest.php
similarity index 100%
rename from tests/PhpWord/Section/HeaderTest.php
rename to test/PhpWord/Section/HeaderTest.php
diff --git a/tests/PHPWord/Section/ImageTest.php b/test/PhpWord/Section/ImageTest.php
similarity index 100%
rename from tests/PHPWord/Section/ImageTest.php
rename to test/PhpWord/Section/ImageTest.php
diff --git a/tests/PhpWord/Section/LinkTest.php b/test/PhpWord/Section/LinkTest.php
similarity index 100%
rename from tests/PhpWord/Section/LinkTest.php
rename to test/PhpWord/Section/LinkTest.php
diff --git a/tests/PHPWord/Section/ListItemTest.php b/test/PhpWord/Section/ListItemTest.php
similarity index 100%
rename from tests/PHPWord/Section/ListItemTest.php
rename to test/PhpWord/Section/ListItemTest.php
diff --git a/tests/PhpWord/Section/MemoryImageTest.php b/test/PhpWord/Section/MemoryImageTest.php
similarity index 100%
rename from tests/PhpWord/Section/MemoryImageTest.php
rename to test/PhpWord/Section/MemoryImageTest.php
diff --git a/tests/PhpWord/Section/ObjectTest.php b/test/PhpWord/Section/ObjectTest.php
similarity index 100%
rename from tests/PhpWord/Section/ObjectTest.php
rename to test/PhpWord/Section/ObjectTest.php
diff --git a/tests/PhpWord/Section/PageBreakTest.php b/test/PhpWord/Section/PageBreakTest.php
similarity index 100%
rename from tests/PhpWord/Section/PageBreakTest.php
rename to test/PhpWord/Section/PageBreakTest.php
diff --git a/tests/PhpWord/Section/SettingsTest.php b/test/PhpWord/Section/SettingsTest.php
similarity index 100%
rename from tests/PhpWord/Section/SettingsTest.php
rename to test/PhpWord/Section/SettingsTest.php
diff --git a/tests/PhpWord/Section/Table/CellTest.php b/test/PhpWord/Section/Table/CellTest.php
similarity index 100%
rename from tests/PhpWord/Section/Table/CellTest.php
rename to test/PhpWord/Section/Table/CellTest.php
diff --git a/tests/PhpWord/Section/Table/RowTest.php b/test/PhpWord/Section/Table/RowTest.php
similarity index 100%
rename from tests/PhpWord/Section/Table/RowTest.php
rename to test/PhpWord/Section/Table/RowTest.php
diff --git a/tests/PhpWord/Section/TableTest.php b/test/PhpWord/Section/TableTest.php
similarity index 100%
rename from tests/PhpWord/Section/TableTest.php
rename to test/PhpWord/Section/TableTest.php
diff --git a/tests/PhpWord/Section/TextBreakTest.php b/test/PhpWord/Section/TextBreakTest.php
similarity index 100%
rename from tests/PhpWord/Section/TextBreakTest.php
rename to test/PhpWord/Section/TextBreakTest.php
diff --git a/tests/PhpWord/Section/TextRunTest.php b/test/PhpWord/Section/TextRunTest.php
similarity index 100%
rename from tests/PhpWord/Section/TextRunTest.php
rename to test/PhpWord/Section/TextRunTest.php
diff --git a/tests/PHPWord/Section/TextTest.php b/test/PhpWord/Section/TextTest.php
similarity index 100%
rename from tests/PHPWord/Section/TextTest.php
rename to test/PhpWord/Section/TextTest.php
diff --git a/tests/PhpWord/Section/TitleTest.php b/test/PhpWord/Section/TitleTest.php
similarity index 100%
rename from tests/PhpWord/Section/TitleTest.php
rename to test/PhpWord/Section/TitleTest.php
diff --git a/tests/PhpWord/SectionTest.php b/test/PhpWord/SectionTest.php
similarity index 100%
rename from tests/PhpWord/SectionTest.php
rename to test/PhpWord/SectionTest.php
diff --git a/tests/PHPWord/SettingsTest.php b/test/PhpWord/SettingsTest.php
similarity index 100%
rename from tests/PHPWord/SettingsTest.php
rename to test/PhpWord/SettingsTest.php
diff --git a/tests/PhpWord/Shared/DrawingTest.php b/test/PhpWord/Shared/DrawingTest.php
similarity index 100%
rename from tests/PhpWord/Shared/DrawingTest.php
rename to test/PhpWord/Shared/DrawingTest.php
diff --git a/tests/PHPWord/Shared/FileTest.php b/test/PhpWord/Shared/FileTest.php
similarity index 100%
rename from tests/PHPWord/Shared/FileTest.php
rename to test/PhpWord/Shared/FileTest.php
diff --git a/tests/PhpWord/Shared/FontTest.php b/test/PhpWord/Shared/FontTest.php
similarity index 100%
rename from tests/PhpWord/Shared/FontTest.php
rename to test/PhpWord/Shared/FontTest.php
diff --git a/tests/PHPWord/Shared/StringTest.php b/test/PhpWord/Shared/StringTest.php
similarity index 100%
rename from tests/PHPWord/Shared/StringTest.php
rename to test/PhpWord/Shared/StringTest.php
diff --git a/tests/PhpWord/Style/CellTest.php b/test/PhpWord/Style/CellTest.php
similarity index 100%
rename from tests/PhpWord/Style/CellTest.php
rename to test/PhpWord/Style/CellTest.php
diff --git a/tests/PhpWord/Style/FontTest.php b/test/PhpWord/Style/FontTest.php
similarity index 100%
rename from tests/PhpWord/Style/FontTest.php
rename to test/PhpWord/Style/FontTest.php
diff --git a/tests/PhpWord/Style/ImageTest.php b/test/PhpWord/Style/ImageTest.php
similarity index 100%
rename from tests/PhpWord/Style/ImageTest.php
rename to test/PhpWord/Style/ImageTest.php
diff --git a/tests/PhpWord/Style/ListItemTest.php b/test/PhpWord/Style/ListItemTest.php
similarity index 100%
rename from tests/PhpWord/Style/ListItemTest.php
rename to test/PhpWord/Style/ListItemTest.php
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/test/PhpWord/Style/ParagraphTest.php
similarity index 100%
rename from tests/PhpWord/Style/ParagraphTest.php
rename to test/PhpWord/Style/ParagraphTest.php
diff --git a/tests/PhpWord/Style/RowTest.php b/test/PhpWord/Style/RowTest.php
similarity index 100%
rename from tests/PhpWord/Style/RowTest.php
rename to test/PhpWord/Style/RowTest.php
diff --git a/tests/PhpWord/Style/TOCTest.php b/test/PhpWord/Style/TOCTest.php
similarity index 100%
rename from tests/PhpWord/Style/TOCTest.php
rename to test/PhpWord/Style/TOCTest.php
diff --git a/tests/PhpWord/Style/TableFullTest.php b/test/PhpWord/Style/TableFullTest.php
similarity index 100%
rename from tests/PhpWord/Style/TableFullTest.php
rename to test/PhpWord/Style/TableFullTest.php
diff --git a/tests/PhpWord/Style/TableTest.php b/test/PhpWord/Style/TableTest.php
similarity index 100%
rename from tests/PhpWord/Style/TableTest.php
rename to test/PhpWord/Style/TableTest.php
diff --git a/tests/PhpWord/Style/TabsTest.php b/test/PhpWord/Style/TabsTest.php
similarity index 100%
rename from tests/PhpWord/Style/TabsTest.php
rename to test/PhpWord/Style/TabsTest.php
diff --git a/tests/PHPWord/StyleTest.php b/test/PhpWord/StyleTest.php
similarity index 100%
rename from tests/PHPWord/StyleTest.php
rename to test/PhpWord/StyleTest.php
diff --git a/tests/PhpWord/TOCTest.php b/test/PhpWord/TOCTest.php
similarity index 100%
rename from tests/PhpWord/TOCTest.php
rename to test/PhpWord/TOCTest.php
diff --git a/tests/PhpWord/TemplateTest.php b/test/PhpWord/TemplateTest.php
similarity index 100%
rename from tests/PhpWord/TemplateTest.php
rename to test/PhpWord/TemplateTest.php
diff --git a/tests/PhpWord/Writer/ODText/ContentTest.php b/test/PhpWord/Writer/ODText/ContentTest.php
similarity index 100%
rename from tests/PhpWord/Writer/ODText/ContentTest.php
rename to test/PhpWord/Writer/ODText/ContentTest.php
diff --git a/tests/PHPWord/Writer/ODText/WriterPartTest.php b/test/PhpWord/Writer/ODText/WriterPartTest.php
similarity index 100%
rename from tests/PHPWord/Writer/ODText/WriterPartTest.php
rename to test/PhpWord/Writer/ODText/WriterPartTest.php
diff --git a/tests/PhpWord/Writer/ODTextTest.php b/test/PhpWord/Writer/ODTextTest.php
similarity index 100%
rename from tests/PhpWord/Writer/ODTextTest.php
rename to test/PhpWord/Writer/ODTextTest.php
diff --git a/tests/PhpWord/Writer/RTFTest.php b/test/PhpWord/Writer/RTFTest.php
similarity index 100%
rename from tests/PhpWord/Writer/RTFTest.php
rename to test/PhpWord/Writer/RTFTest.php
diff --git a/tests/PhpWord/Writer/Word2007/BaseTest.php b/test/PhpWord/Writer/Word2007/BaseTest.php
similarity index 100%
rename from tests/PhpWord/Writer/Word2007/BaseTest.php
rename to test/PhpWord/Writer/Word2007/BaseTest.php
diff --git a/tests/PhpWord/Writer/Word2007/DocumentTest.php b/test/PhpWord/Writer/Word2007/DocumentTest.php
similarity index 100%
rename from tests/PhpWord/Writer/Word2007/DocumentTest.php
rename to test/PhpWord/Writer/Word2007/DocumentTest.php
diff --git a/tests/PHPWord/Writer/Word2007/FooterTest.php b/test/PhpWord/Writer/Word2007/FooterTest.php
similarity index 100%
rename from tests/PHPWord/Writer/Word2007/FooterTest.php
rename to test/PhpWord/Writer/Word2007/FooterTest.php
diff --git a/tests/PhpWord/Writer/Word2007/FootnotesTest.php b/test/PhpWord/Writer/Word2007/FootnotesTest.php
similarity index 100%
rename from tests/PhpWord/Writer/Word2007/FootnotesTest.php
rename to test/PhpWord/Writer/Word2007/FootnotesTest.php
diff --git a/tests/PHPWord/Writer/Word2007/HeaderTest.php b/test/PhpWord/Writer/Word2007/HeaderTest.php
similarity index 100%
rename from tests/PHPWord/Writer/Word2007/HeaderTest.php
rename to test/PhpWord/Writer/Word2007/HeaderTest.php
diff --git a/tests/PhpWord/Writer/Word2007/StylesTest.php b/test/PhpWord/Writer/Word2007/StylesTest.php
similarity index 100%
rename from tests/PhpWord/Writer/Word2007/StylesTest.php
rename to test/PhpWord/Writer/Word2007/StylesTest.php
diff --git a/tests/PHPWord/Writer/Word2007/WriterPartTest.php b/test/PhpWord/Writer/Word2007/WriterPartTest.php
similarity index 100%
rename from tests/PHPWord/Writer/Word2007/WriterPartTest.php
rename to test/PhpWord/Writer/Word2007/WriterPartTest.php
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/test/PhpWord/Writer/Word2007Test.php
similarity index 100%
rename from tests/PhpWord/Writer/Word2007Test.php
rename to test/PhpWord/Writer/Word2007Test.php
diff --git a/tests/common/bootstrap.php b/test/bootstrap.php
similarity index 100%
rename from tests/common/bootstrap.php
rename to test/bootstrap.php
diff --git a/tests/common/TestHelperDOCX.php b/test/common/TestHelperDOCX.php
similarity index 100%
rename from tests/common/TestHelperDOCX.php
rename to test/common/TestHelperDOCX.php
diff --git a/tests/common/XmlDocument.php b/test/common/XmlDocument.php
similarity index 100%
rename from tests/common/XmlDocument.php
rename to test/common/XmlDocument.php
diff --git a/tests/data/documents/reader.docx.zip b/test/data/documents/reader.docx.zip
similarity index 100%
rename from tests/data/documents/reader.docx.zip
rename to test/data/documents/reader.docx.zip
diff --git a/tests/data/documents/sheet.xls b/test/data/documents/sheet.xls
similarity index 100%
rename from tests/data/documents/sheet.xls
rename to test/data/documents/sheet.xls
diff --git a/tests/data/images/PhpWord.png b/test/data/images/PhpWord.png
similarity index 100%
rename from tests/data/images/PhpWord.png
rename to test/data/images/PhpWord.png
diff --git a/tests/data/images/alexz-johnson.pcx b/test/data/images/alexz-johnson.pcx
similarity index 100%
rename from tests/data/images/alexz-johnson.pcx
rename to test/data/images/alexz-johnson.pcx
diff --git a/tests/data/images/angela_merkel.tif b/test/data/images/angela_merkel.tif
similarity index 100%
rename from tests/data/images/angela_merkel.tif
rename to test/data/images/angela_merkel.tif
diff --git a/tests/data/images/duke_nukem.bmp b/test/data/images/duke_nukem.bmp
similarity index 100%
rename from tests/data/images/duke_nukem.bmp
rename to test/data/images/duke_nukem.bmp
diff --git a/tests/data/images/earth.jpg b/test/data/images/earth.jpg
similarity index 100%
rename from tests/data/images/earth.jpg
rename to test/data/images/earth.jpg
diff --git a/tests/data/images/firefox.png b/test/data/images/firefox.png
similarity index 100%
rename from tests/data/images/firefox.png
rename to test/data/images/firefox.png
diff --git a/tests/data/images/mario.gif b/test/data/images/mario.gif
similarity index 100%
rename from tests/data/images/mario.gif
rename to test/data/images/mario.gif
diff --git a/tests/data/images/mars.jpg b/test/data/images/mars.jpg
similarity index 100%
rename from tests/data/images/mars.jpg
rename to test/data/images/mars.jpg
diff --git a/tests/data/images/mars_noext_jpg b/test/data/images/mars_noext_jpg
similarity index 100%
rename from tests/data/images/mars_noext_jpg
rename to test/data/images/mars_noext_jpg
diff --git a/tests/data/xsl/passthrough.xsl b/test/data/xsl/passthrough.xsl
similarity index 100%
rename from tests/data/xsl/passthrough.xsl
rename to test/data/xsl/passthrough.xsl
diff --git a/tests/data/xsl/remove_tables_by_needle.xsl b/test/data/xsl/remove_tables_by_needle.xsl
similarity index 100%
rename from tests/data/xsl/remove_tables_by_needle.xsl
rename to test/data/xsl/remove_tables_by_needle.xsl
diff --git a/tests/PhpWord/Shared/FileTest.php b/tests/PhpWord/Shared/FileTest.php
deleted file mode 100644
index d3fd4869..00000000
--- a/tests/PhpWord/Shared/FileTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace PhpWord\Tests\Shared;
-
-use PhpOffice\PhpWord\Shared\File;
-
-/**
- * @coversDefaultClass          \PhpOffice\PhpWord\Shared\File
- * @runTestsInSeparateProcesses
- */
-class FileTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * Test file_exists()
-     */
-    public function testFileExists()
-    {
-        $dir = join(\DIRECTORY_SEPARATOR, array(\PHPWORD_TESTS_BASE_DIR, 'data', 'templates'));
-        chdir($dir);
-        $this->assertTrue(File::file_exists('blank.docx'));
-    }
-    /**
-     * Test file_exists()
-     */
-    public function testNoFileExists()
-    {
-        $dir = join(\DIRECTORY_SEPARATOR, array(\PHPWORD_TESTS_BASE_DIR, 'data', 'templates'));
-        chdir($dir);
-        $this->assertFalse(File::file_exists('404.docx'));
-    }
-
-    /**
-     * Test realpath()
-     */
-    public function testRealpath()
-    {
-        $dir = join(\DIRECTORY_SEPARATOR, array(\PHPWORD_TESTS_BASE_DIR, 'data', 'templates'));
-        chdir($dir);
-        $file     = 'blank.docx';
-        $expected = $dir . \DIRECTORY_SEPARATOR . $file;
-        $this->assertEquals($expected, File::realpath($file));
-    }
-}
diff --git a/tests/data/documents/reader.docx b/tests/data/documents/reader.docx
deleted file mode 100644
index e2ceeb64..00000000
Binary files a/tests/data/documents/reader.docx and /dev/null differ
diff --git a/tests/data/documents/without_table_macros.docx b/tests/data/documents/without_table_macros.docx
deleted file mode 100644
index e4e9767f..00000000
Binary files a/tests/data/documents/without_table_macros.docx and /dev/null differ
diff --git a/tests/data/templates/blank.docx b/tests/data/templates/blank.docx
deleted file mode 100644
index 071b7f35..00000000
Binary files a/tests/data/templates/blank.docx and /dev/null differ
diff --git a/tests/data/templates/clone-merge.docx b/tests/data/templates/clone-merge.docx
deleted file mode 100644
index eb944367..00000000
Binary files a/tests/data/templates/clone-merge.docx and /dev/null differ
diff --git a/tests/data/templates/corrupted_main_document_part.docx b/tests/data/templates/corrupted_main_document_part.docx
deleted file mode 100644
index 69712525..00000000
Binary files a/tests/data/templates/corrupted_main_document_part.docx and /dev/null differ
diff --git a/tests/data/templates/with_table_macros.docx b/tests/data/templates/with_table_macros.docx
deleted file mode 100644
index cd5ed6ce..00000000
Binary files a/tests/data/templates/with_table_macros.docx and /dev/null differ