diff --git a/.travis.yml b/.travis.yml
index e4bc51a..852dc1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,32 @@
 language: php
 
-before_script:
-  - sudo apt-get update
-  - sudo apt-get install -y ffmpeg libavcodec-extra-53
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
+branches:
+  only:
+    - master
 
 php:
-  - 5.3.3
   - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+  include:
+    - php: 5.3
+      env: COMPOSER_FLAGS="--prefer-lowest"
+
+before_install:
+  - sudo apt-get update
+  - composer self-update
+  - if [ "$COMPOSER_FLAGS" == "--prefer-lowest" ]; then composer require "roave/security-advisories" dev-master --no-update; fi;
+
+install:
+  - sudo apt-get install -y ffmpeg libavcodec-extra-53
+  - composer update --prefer-source $COMPOSER_FLAGS
 
 script:
   - vendor/bin/phpunit --verbose
-  - vendor/bin/phpunit --verbose -c phpunit-functional.xml.dist
diff --git a/composer.json b/composer.json
index 8fa6a0e..6527383 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": "^5.3.9 || ^7.0",
         "alchemy/binary-driver": "^1.5",
         "doctrine/cache": "^1.0",
         "evenement/evenement": "^2.0 || ^1.0",
@@ -34,13 +34,18 @@
     "require-dev": {
         "sami/sami": "~1.0",
         "silex/silex": "~1.0",
-        "phpunit/phpunit": "~3.7"
+        "phpunit/phpunit": "^4.8"
     },
     "autoload": {
         "psr-0": {
             "FFMpeg": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\FFMpeg\\": "tests"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.6-dev"
diff --git a/phpunit-functional.xml.dist b/phpunit-functional.xml.dist
deleted file mode 100644
index 3f0f738..0000000
--- a/phpunit-functional.xml.dist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="true"
-         verbose="false"
-         bootstrap="tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="FFMpeg Tests Suite">
-            <directory>tests/FFMpeg/Functional</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-      <blacklist>
-        <directory>vendor</directory>
-        <directory>tests</directory>
-      </blacklist>
-    </filter>
-
-</phpunit>
-
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f36c568..3027d1f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,16 +12,19 @@
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="FFMpeg Tests Suite">
-            <directory>tests/FFMpeg/Tests</directory>
+        <testsuite name="unit">
+            <directory>tests/Unit</directory>
+        </testsuite>
+        <testsuite name="functional">
+            <directory>tests/Functional</directory>
         </testsuite>
     </testsuites>
+
     <filter>
       <blacklist>
         <directory>vendor</directory>
         <directory>tests</directory>
       </blacklist>
     </filter>
-
 </phpunit>
 
diff --git a/tests/FFMpeg/Functional/FFProbeTest.php b/tests/Functional/FFProbeTest.php
similarity index 90%
rename from tests/FFMpeg/Functional/FFProbeTest.php
rename to tests/Functional/FFProbeTest.php
index 5f7bb03..10a98c0 100644
--- a/tests/FFMpeg/Functional/FFProbeTest.php
+++ b/tests/Functional/FFProbeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Functional;
+namespace Tests\FFMpeg\Functional;
 
 use FFMpeg\FFProbe;
 
@@ -9,7 +9,7 @@ class FFProbeTest extends FunctionalTestCase
     public function testProbeOnFile()
     {
         $ffprobe = FFProbe::create();
-        $this->assertGreaterThan(0, count($ffprobe->streams(__DIR__ . '/../../files/Audio.mp3')));
+        $this->assertGreaterThan(0, count($ffprobe->streams(__DIR__ . '/../files/Audio.mp3')));
     }
 
     /**
diff --git a/tests/FFMpeg/Functional/FunctionalTestCase.php b/tests/Functional/FunctionalTestCase.php
similarity index 87%
rename from tests/FFMpeg/Functional/FunctionalTestCase.php
rename to tests/Functional/FunctionalTestCase.php
index 25e6461..02556ea 100644
--- a/tests/FFMpeg/Functional/FunctionalTestCase.php
+++ b/tests/Functional/FunctionalTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Functional;
+namespace Tests\FFMpeg\Functional;
 
 use FFMpeg\FFMpeg;
 
diff --git a/tests/FFMpeg/Functional/VideoTranscodeTest.php b/tests/Functional/VideoTranscodeTest.php
similarity index 90%
rename from tests/FFMpeg/Functional/VideoTranscodeTest.php
rename to tests/Functional/VideoTranscodeTest.php
index 9e690bf..f36f1c5 100644
--- a/tests/FFMpeg/Functional/VideoTranscodeTest.php
+++ b/tests/Functional/VideoTranscodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Functional;
+namespace Tests\FFMpeg\Functional;
 
 use FFMpeg\Coordinate\Dimension;
 use FFMpeg\Filters\Video\ResizeFilter;
@@ -18,7 +18,7 @@ class VideoTranscodeTest extends FunctionalTestCase
         }
 
         $ffmpeg = $this->getFFMpeg();
-        $video = $ffmpeg->open(__DIR__ . '/../../files/Test.ogv');
+        $video = $ffmpeg->open(__DIR__ . '/../files/Test.ogv');
 
         $this->assertInstanceOf('FFMpeg\Media\Video', $video);
 
@@ -46,13 +46,13 @@ class VideoTranscodeTest extends FunctionalTestCase
     public function testTranscodeInvalidFile()
     {
         $ffmpeg = $this->getFFMpeg();
-        $ffmpeg->open(__DIR__ . '/../../files/UnknownFileTest.ogv');
+        $ffmpeg->open(__DIR__ . '/../files/UnknownFileTest.ogv');
     }
 
     public function testSaveInvalidForgedVideo()
     {
         $ffmpeg = $this->getFFMpeg();
-        $video = new Video(__DIR__ . '/../../files/UnknownFileTest.ogv', $ffmpeg->getFFMpegDriver(), $ffmpeg->getFFProbe());
+        $video = new Video(__DIR__ . '/../files/UnknownFileTest.ogv', $ffmpeg->getFFMpegDriver(), $ffmpeg->getFFProbe());
 
         $this->setExpectedException('FFMpeg\Exception\RuntimeException');
         $video->save(new X264('libvo_aacenc'), __DIR__ . '/output/output-x264.mp4');
@@ -72,7 +72,7 @@ class VideoTranscodeTest extends FunctionalTestCase
         }
 
         $ffmpeg = $this->getFFMpeg();
-        $video = $ffmpeg->open(__DIR__ . '/../../files/portrait.MOV');
+        $video = $ffmpeg->open(__DIR__ . '/../files/portrait.MOV');
 
         $video->filters()
             ->resize(new Dimension(320, 240), ResizeFilter::RESIZEMODE_INSET)
diff --git a/tests/FFMpeg/Functional/output/.placeholder b/tests/Functional/output/.placeholder
similarity index 100%
rename from tests/FFMpeg/Functional/output/.placeholder
rename to tests/Functional/output/.placeholder
diff --git a/tests/FFMpeg/Tests/Coordinate/AspectRatioTest.php b/tests/Unit/Coordinate/AspectRatioTest.php
similarity index 97%
rename from tests/FFMpeg/Tests/Coordinate/AspectRatioTest.php
rename to tests/Unit/Coordinate/AspectRatioTest.php
index 49e703c..100b6b7 100644
--- a/tests/FFMpeg/Tests/Coordinate/AspectRatioTest.php
+++ b/tests/Unit/Coordinate/AspectRatioTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
 use FFMpeg\Coordinate\Dimension;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\AspectRatio;
 
 class AspectRatioTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Coordinate/DimensionTest.php b/tests/Unit/Coordinate/DimensionTest.php
similarity index 91%
rename from tests/FFMpeg/Tests/Coordinate/DimensionTest.php
rename to tests/Unit/Coordinate/DimensionTest.php
index 2b3e14b..eed0c80 100644
--- a/tests/FFMpeg/Tests/Coordinate/DimensionTest.php
+++ b/tests/Unit/Coordinate/DimensionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\Dimension;
 
 class DimensionTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Coordinate/FrameRateTest.php b/tests/Unit/Coordinate/FrameRateTest.php
similarity index 88%
rename from tests/FFMpeg/Tests/Coordinate/FrameRateTest.php
rename to tests/Unit/Coordinate/FrameRateTest.php
index 51bfbff..60bf98a 100644
--- a/tests/FFMpeg/Tests/Coordinate/FrameRateTest.php
+++ b/tests/Unit/Coordinate/FrameRateTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\FrameRate;
 
 class FrameRateTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Coordinate/PointTest.php b/tests/Unit/Coordinate/PointTest.php
similarity index 77%
rename from tests/FFMpeg/Tests/Coordinate/PointTest.php
rename to tests/Unit/Coordinate/PointTest.php
index 33e3d37..09bd22e 100644
--- a/tests/FFMpeg/Tests/Coordinate/PointTest.php
+++ b/tests/Unit/Coordinate/PointTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\Point;
 
 class PointTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Coordinate/TimeCodeTest.php b/tests/Unit/Coordinate/TimeCodeTest.php
similarity index 95%
rename from tests/FFMpeg/Tests/Coordinate/TimeCodeTest.php
rename to tests/Unit/Coordinate/TimeCodeTest.php
index 894f947..08a6397 100644
--- a/tests/FFMpeg/Tests/Coordinate/TimeCodeTest.php
+++ b/tests/Unit/Coordinate/TimeCodeTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Coordinate;
+namespace Tests\FFMpeg\Unit\Coordinate;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\TimeCode;
 
 class TimeCodeTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Driver/FFMpegDriverTest.php b/tests/Unit/Driver/FFMpegDriverTest.php
similarity index 95%
rename from tests/FFMpeg/Tests/Driver/FFMpegDriverTest.php
rename to tests/Unit/Driver/FFMpegDriverTest.php
index 26a2b34..7261fe3 100644
--- a/tests/FFMpeg/Tests/Driver/FFMpegDriverTest.php
+++ b/tests/Unit/Driver/FFMpegDriverTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Driver;
+namespace Tests\FFMpeg\Unit\Driver;
 
 use Alchemy\BinaryDriver\Configuration;
 use FFMpeg\Driver\FFMpegDriver;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
 
 class FFMpegDriverTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Driver/FFProbeDriverTest.php b/tests/Unit/Driver/FFProbeDriverTest.php
similarity index 95%
rename from tests/FFMpeg/Tests/Driver/FFProbeDriverTest.php
rename to tests/Unit/Driver/FFProbeDriverTest.php
index 62d2cd0..e430491 100644
--- a/tests/FFMpeg/Tests/Driver/FFProbeDriverTest.php
+++ b/tests/Unit/Driver/FFProbeDriverTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Driver;
+namespace Tests\FFMpeg\Unit\Driver;
 
 use Alchemy\BinaryDriver\Configuration;
 use FFMpeg\Driver\FFProbeDriver;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use Symfony\Component\Process\ExecutableFinder;
 
 class FFProbeDriverTest extends TestCase
diff --git a/tests/FFMpeg/Tests/FFMpegServiceProviderTest.php b/tests/Unit/FFMpegServiceProviderTest.php
similarity index 98%
rename from tests/FFMpeg/Tests/FFMpegServiceProviderTest.php
rename to tests/Unit/FFMpegServiceProviderTest.php
index ac9f8a9..0321eed 100644
--- a/tests/FFMpeg/Tests/FFMpegServiceProviderTest.php
+++ b/tests/Unit/FFMpegServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 use FFMpeg\FFMpegServiceProvider;
 use Silex\Application;
diff --git a/tests/FFMpeg/Tests/FFMpegTest.php b/tests/Unit/FFMpegTest.php
similarity index 99%
rename from tests/FFMpeg/Tests/FFMpegTest.php
rename to tests/Unit/FFMpegTest.php
index 6dc4bed..53b0b72 100644
--- a/tests/FFMpeg/Tests/FFMpegTest.php
+++ b/tests/Unit/FFMpegTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 use FFMpeg\FFMpeg;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
diff --git a/tests/FFMpeg/Tests/FFProbe/DataMapping/AbstractDataTest.php b/tests/Unit/FFProbe/DataMapping/AbstractDataTest.php
similarity index 94%
rename from tests/FFMpeg/Tests/FFProbe/DataMapping/AbstractDataTest.php
rename to tests/Unit/FFProbe/DataMapping/AbstractDataTest.php
index 1e49c0f..a870ae6 100644
--- a/tests/FFMpeg/Tests/FFProbe/DataMapping/AbstractDataTest.php
+++ b/tests/Unit/FFProbe/DataMapping/AbstractDataTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe\DataMapping;
+namespace Tests\FFMpeg\Unit\FFProbe\DataMapping;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\AbstractData;
 
 class AbstractDataTest extends TestCase
diff --git a/tests/FFMpeg/Tests/FFProbe/DataMapping/StreamCollectionTest.php b/tests/Unit/FFProbe/DataMapping/StreamCollectionTest.php
similarity index 96%
rename from tests/FFMpeg/Tests/FFProbe/DataMapping/StreamCollectionTest.php
rename to tests/Unit/FFProbe/DataMapping/StreamCollectionTest.php
index e010f1a..64937cc 100644
--- a/tests/FFMpeg/Tests/FFProbe/DataMapping/StreamCollectionTest.php
+++ b/tests/Unit/FFProbe/DataMapping/StreamCollectionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe\DataMapping;
+namespace Tests\FFMpeg\Unit\FFProbe\DataMapping;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 
 class StreamCollectionTest extends TestCase
diff --git a/tests/FFMpeg/Tests/FFProbe/DataMapping/StreamTest.php b/tests/Unit/FFProbe/DataMapping/StreamTest.php
similarity index 98%
rename from tests/FFMpeg/Tests/FFProbe/DataMapping/StreamTest.php
rename to tests/Unit/FFProbe/DataMapping/StreamTest.php
index 5526a1d..8fa8aec 100644
--- a/tests/FFMpeg/Tests/FFProbe/DataMapping/StreamTest.php
+++ b/tests/Unit/FFProbe/DataMapping/StreamTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe\DataMapping;
+namespace Tests\FFMpeg\Unit\FFProbe\DataMapping;
 
 use FFMpeg\Coordinate\Dimension;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\Stream;
 
 class StreamTest extends TestCase
diff --git a/tests/FFMpeg/Tests/FFProbe/MapperTest.php b/tests/Unit/FFProbe/MapperTest.php
similarity index 87%
rename from tests/FFMpeg/Tests/FFProbe/MapperTest.php
rename to tests/Unit/FFProbe/MapperTest.php
index 519e1b4..d4904a1 100644
--- a/tests/FFMpeg/Tests/FFProbe/MapperTest.php
+++ b/tests/Unit/FFProbe/MapperTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe;
+namespace Tests\FFMpeg\Unit\FFProbe;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\Mapper;
 use FFMpeg\FFProbe;
 use FFMpeg\FFProbe\DataMapping\Format;
@@ -31,8 +31,8 @@ class MapperTest extends TestCase
 
     public function provideMappings()
     {
-        $format = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_format.json'), true);
-        $streams = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_streams.json'), true);
+        $format = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_format.json'), true);
+        $streams = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_streams.json'), true);
 
         return array(
             array(FFProbe::TYPE_FORMAT, $format, new Format($format['format'])),
diff --git a/tests/FFMpeg/Tests/FFProbe/OptionsTesterTest.php b/tests/Unit/FFProbe/OptionsTesterTest.php
similarity index 95%
rename from tests/FFMpeg/Tests/FFProbe/OptionsTesterTest.php
rename to tests/Unit/FFProbe/OptionsTesterTest.php
index f1f48b6..4f4ef56 100644
--- a/tests/FFMpeg/Tests/FFProbe/OptionsTesterTest.php
+++ b/tests/Unit/FFProbe/OptionsTesterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe;
+namespace Tests\FFMpeg\Unit\FFProbe;
 
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\OptionsTester;
 
 class OptionsTesterTest extends TestCase
@@ -55,7 +55,7 @@ class OptionsTesterTest extends TestCase
 
     public function provideOptions()
     {
-        $data = file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/help.raw');
+        $data = file_get_contents(__DIR__ . '/../../fixtures/ffprobe/help.raw');
 
         return array(
             array(true, $data, '-print_format'),
diff --git a/tests/FFMpeg/Tests/FFProbe/OutputParserTest.php b/tests/Unit/FFProbe/OutputParserTest.php
similarity index 72%
rename from tests/FFMpeg/Tests/FFProbe/OutputParserTest.php
rename to tests/Unit/FFProbe/OutputParserTest.php
index 96e90af..e09916d 100644
--- a/tests/FFMpeg/Tests/FFProbe/OutputParserTest.php
+++ b/tests/Unit/FFProbe/OutputParserTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\FFProbe;
+namespace Tests\FFMpeg\Unit\FFProbe;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\OutputParser;
 use FFMpeg\FFProbe;
 
@@ -28,11 +28,11 @@ class OutputParserTest extends TestCase
 
     public function provideTypeDataAndOutput()
     {
-        $expectedFormat = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_format.json'), true);
-        $expectedStreams = json_decode(file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_streams.json'), true);
+        $expectedFormat = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_format.json'), true);
+        $expectedStreams = json_decode(file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_streams.json'), true);
 
-        $rawFormat = file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_format.raw');
-        $rawStreams = file_get_contents(__DIR__ . '/../../../fixtures/ffprobe/show_streams.raw');
+        $rawFormat = file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_format.raw');
+        $rawStreams = file_get_contents(__DIR__ . '/../../fixtures/ffprobe/show_streams.raw');
 
         return array(
             array(FFProbe::TYPE_FORMAT, $rawFormat, $expectedFormat),
diff --git a/tests/FFMpeg/Tests/FFProbeTest.php b/tests/Unit/FFProbeTest.php
similarity index 99%
rename from tests/FFMpeg/Tests/FFProbeTest.php
rename to tests/Unit/FFProbeTest.php
index a089dcb..4530f59 100644
--- a/tests/FFMpeg/Tests/FFProbeTest.php
+++ b/tests/Unit/FFProbeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 use FFMpeg\FFProbe;
 use Symfony\Component\Process\ExecutableFinder;
diff --git a/tests/FFMpeg/Tests/Filters/Audio/AudioFiltersTest.php b/tests/Unit/Filters/Audio/AudioFiltersTest.php
similarity index 89%
rename from tests/FFMpeg/Tests/Filters/Audio/AudioFiltersTest.php
rename to tests/Unit/Filters/Audio/AudioFiltersTest.php
index 930cca9..3bbeae9 100644
--- a/tests/FFMpeg/Tests/Filters/Audio/AudioFiltersTest.php
+++ b/tests/Unit/Filters/Audio/AudioFiltersTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Audio;
+namespace Tests\FFMpeg\Unit\Filters\Audio;
 
 use FFMpeg\Filters\Audio\AudioFilters;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class AudioFiltersTest extends TestCase
 {
diff --git a/tests/FFMpeg/Tests/Filters/Audio/AudioResamplableFilterTest.php b/tests/Unit/Filters/Audio/AudioResamplableFilterTest.php
similarity index 88%
rename from tests/FFMpeg/Tests/Filters/Audio/AudioResamplableFilterTest.php
rename to tests/Unit/Filters/Audio/AudioResamplableFilterTest.php
index fbed42c..1d24393 100644
--- a/tests/FFMpeg/Tests/Filters/Audio/AudioResamplableFilterTest.php
+++ b/tests/Unit/Filters/Audio/AudioResamplableFilterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Audio;
+namespace Tests\FFMpeg\Unit\Filters\Audio;
 
 use FFMpeg\Filters\Audio\AudioResamplableFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class AudioResamplableFilterTest extends TestCase
 {
diff --git a/tests/FFMpeg/Tests/Filters/FiltersCollectionTest.php b/tests/Unit/Filters/FiltersCollectionTest.php
similarity index 96%
rename from tests/FFMpeg/Tests/Filters/FiltersCollectionTest.php
rename to tests/Unit/Filters/FiltersCollectionTest.php
index 5a29008..e10f946 100644
--- a/tests/FFMpeg/Tests/Filters/FiltersCollectionTest.php
+++ b/tests/Unit/Filters/FiltersCollectionTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Filters;
+namespace Tests\FFMpeg\Unit\Filters;
 
 use FFMpeg\Filters\FiltersCollection;
 use FFMpeg\Filters\Audio\SimpleFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class FiltersCollectionTest extends TestCase
 {
diff --git a/tests/FFMpeg/Tests/Filters/Frame/DisplayRatioFixerFilterTest.php b/tests/Unit/Filters/Frame/DisplayRatioFixerFilterTest.php
similarity index 92%
rename from tests/FFMpeg/Tests/Filters/Frame/DisplayRatioFixerFilterTest.php
rename to tests/Unit/Filters/Frame/DisplayRatioFixerFilterTest.php
index ca8035f..5b40b32 100644
--- a/tests/FFMpeg/Tests/Filters/Frame/DisplayRatioFixerFilterTest.php
+++ b/tests/Unit/Filters/Frame/DisplayRatioFixerFilterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Frame;
+namespace Tests\FFMpeg\Unit\Filters\Frame;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Frame\DisplayRatioFixerFilter;
 use FFMpeg\Media\Frame;
 use FFMpeg\Coordinate\TimeCode;
diff --git a/tests/FFMpeg/Tests/Filters/Frame/FrameFiltersTest.php b/tests/Unit/Filters/Frame/FrameFiltersTest.php
similarity index 84%
rename from tests/FFMpeg/Tests/Filters/Frame/FrameFiltersTest.php
rename to tests/Unit/Filters/Frame/FrameFiltersTest.php
index a0e6434..891ba4f 100644
--- a/tests/FFMpeg/Tests/Filters/Frame/FrameFiltersTest.php
+++ b/tests/Unit/Filters/Frame/FrameFiltersTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Frame;
+namespace Tests\FFMpeg\Unit\Filters\Frame;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Frame\FrameFilters;
 
 class FrameFiltersTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Filters/Video/CropFilterTest.php b/tests/Unit/Filters/Video/CropFilterTest.php
similarity index 94%
rename from tests/FFMpeg/Tests/Filters/Video/CropFilterTest.php
rename to tests/Unit/Filters/Video/CropFilterTest.php
index 140fe74..b865c0d 100644
--- a/tests/FFMpeg/Tests/Filters/Video/CropFilterTest.php
+++ b/tests/Unit/Filters/Video/CropFilterTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Coordinate\Dimension;
 use FFMpeg\Coordinate\Point;
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\CropFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class CropFilterTest extends TestCase
 {
diff --git a/tests/FFMpeg/Tests/Filters/Video/CustomFilterTest.php b/tests/Unit/Filters/Video/CustomFilterTest.php
similarity index 87%
rename from tests/FFMpeg/Tests/Filters/Video/CustomFilterTest.php
rename to tests/Unit/Filters/Video/CustomFilterTest.php
index ff8ad75..f3cc047 100644
--- a/tests/FFMpeg/Tests/Filters/Video/CustomFilterTest.php
+++ b/tests/Unit/Filters/Video/CustomFilterTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Filters\Video\CustomFilter;
 use FFMpeg\Filters\Video\FrameRateFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\FrameRate;
 
 class CustomFilterTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Filters/Video/FrameRateFilterTest.php b/tests/Unit/Filters/Video/FrameRateFilterTest.php
similarity index 94%
rename from tests/FFMpeg/Tests/Filters/Video/FrameRateFilterTest.php
rename to tests/Unit/Filters/Video/FrameRateFilterTest.php
index 5ca4ffa..b25b88f 100644
--- a/tests/FFMpeg/Tests/Filters/Video/FrameRateFilterTest.php
+++ b/tests/Unit/Filters/Video/FrameRateFilterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Filters\Video\FrameRateFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Coordinate\FrameRate;
 
 class FrameRateFilterTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Filters/Video/ResizeFilterTest.php b/tests/Unit/Filters/Video/ResizeFilterTest.php
similarity index 98%
rename from tests/FFMpeg/Tests/Filters/Video/ResizeFilterTest.php
rename to tests/Unit/Filters/Video/ResizeFilterTest.php
index 09b58a6..ab92241 100644
--- a/tests/FFMpeg/Tests/Filters/Video/ResizeFilterTest.php
+++ b/tests/Unit/Filters/Video/ResizeFilterTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\Filters\Video\ResizeFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Coordinate\Dimension;
diff --git a/tests/FFMpeg/Tests/Filters/Video/RotateFilterTest.php b/tests/Unit/Filters/Video/RotateFilterTest.php
similarity index 96%
rename from tests/FFMpeg/Tests/Filters/Video/RotateFilterTest.php
rename to tests/Unit/Filters/Video/RotateFilterTest.php
index 95c676f..c8aeeb2 100644
--- a/tests/FFMpeg/Tests/Filters/Video/RotateFilterTest.php
+++ b/tests/Unit/Filters/Video/RotateFilterTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\RotateFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class RotateFilterTest extends TestCase
 {
diff --git a/tests/FFMpeg/Tests/Filters/Video/SynchronizeFilterTest.php b/tests/Unit/Filters/Video/SynchronizeFilterTest.php
similarity index 84%
rename from tests/FFMpeg/Tests/Filters/Video/SynchronizeFilterTest.php
rename to tests/Unit/Filters/Video/SynchronizeFilterTest.php
index 7bf2dc2..85b2562 100644
--- a/tests/FFMpeg/Tests/Filters/Video/SynchronizeFilterTest.php
+++ b/tests/Unit/Filters/Video/SynchronizeFilterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Video\SynchronizeFilter;
 
 class SynchronizeFilterTest extends TestCase
diff --git a/tests/FFMpeg/Tests/Filters/Video/VideoFiltersTest.php b/tests/Unit/Filters/Video/VideoFiltersTest.php
similarity index 96%
rename from tests/FFMpeg/Tests/Filters/Video/VideoFiltersTest.php
rename to tests/Unit/Filters/Video/VideoFiltersTest.php
index f2bed98..7ca3fe9 100644
--- a/tests/FFMpeg/Tests/Filters/Video/VideoFiltersTest.php
+++ b/tests/Unit/Filters/Video/VideoFiltersTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Filters\Video\VideoFilters;
 use FFMpeg\Filters\Video\ResizeFilter;
 
diff --git a/tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php b/tests/Unit/Filters/Video/WatermarkFilterTest.php
similarity index 59%
rename from tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php
rename to tests/Unit/Filters/Video/WatermarkFilterTest.php
index a63d208..4f00095 100644
--- a/tests/FFMpeg/Tests/Filters/Video/WatermarkFilterTest.php
+++ b/tests/Unit/Filters/Video/WatermarkFilterTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace FFMpeg\Tests\Filters\Video;
+namespace Tests\FFMpeg\Unit\Filters\Video;
 
 use FFMpeg\FFProbe\DataMapping\Stream;
 use FFMpeg\FFProbe\DataMapping\StreamCollection;
 use FFMpeg\Filters\Video\RotateFilter;
 use FFMpeg\Filters\Video\WatermarkFilter;
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 class WatermarkFilterTest extends TestCase
 {
@@ -19,8 +19,8 @@ class WatermarkFilterTest extends TestCase
 
         $format = $this->getMock('FFMpeg\Format\VideoInterface');
 
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png');
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format));
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png');
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=0:0 [out]'), $filter->apply($video, $format));
 
         // check size of video is unchanged
         $this->assertEquals(320, $stream->get('width'));
@@ -33,31 +33,31 @@ class WatermarkFilterTest extends TestCase
         $format = $this->getMock('FFMpeg\Format\VideoInterface');
 
         // test position absolute
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'absolute',
             'x' => 10, 'y' => 5
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=10:5 [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=10:5 [out]'), $filter->apply($video, $format));
 
         // test position relative
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'relative',
             'bottom' => 10, 'left' => 5
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:main_h - 10 - overlay_h [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=5:main_h - 10 - overlay_h [out]'), $filter->apply($video, $format));
 
         // test position relative
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'relative',
             'bottom' => 5, 'right' => 4
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=main_w - 4 - overlay_w:main_h - 5 - overlay_h [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=main_w - 4 - overlay_w:main_h - 5 - overlay_h [out]'), $filter->apply($video, $format));
 
         // test position relative
-        $filter = new WatermarkFilter(__DIR__ . '/../../../../files/watermark.png', array(
+        $filter = new WatermarkFilter(__DIR__ . '/../../../files/watermark.png', array(
             'position' => 'relative',
             'left' => 5, 'top' => 11
         ));
-        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../../files/watermark.png [watermark]; [in][watermark] overlay=5:11 [out]'), $filter->apply($video, $format));
+        $this->assertEquals(array('-vf', 'movie='.__DIR__ .'/../../../files/watermark.png [watermark]; [in][watermark] overlay=5:11 [out]'), $filter->apply($video, $format));
     }
 }
diff --git a/tests/FFMpeg/Tests/Format/Audio/AacTest.php b/tests/Unit/Format/Audio/AacTest.php
similarity index 77%
rename from tests/FFMpeg/Tests/Format/Audio/AacTest.php
rename to tests/Unit/Format/Audio/AacTest.php
index 5e98e77..7c316b5 100644
--- a/tests/FFMpeg/Tests/Format/Audio/AacTest.php
+++ b/tests/Unit/Format/Audio/AacTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Aac;
 
diff --git a/tests/FFMpeg/Tests/Format/Audio/AudioTestCase.php b/tests/Unit/Format/Audio/AudioTestCase.php
similarity index 97%
rename from tests/FFMpeg/Tests/Format/Audio/AudioTestCase.php
rename to tests/Unit/Format/Audio/AudioTestCase.php
index d86c3fa..16c0022 100644
--- a/tests/FFMpeg/Tests/Format/Audio/AudioTestCase.php
+++ b/tests/Unit/Format/Audio/AudioTestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Format\Audio\DefaultAudio;
 
 abstract class AudioTestCase extends TestCase
diff --git a/tests/FFMpeg/Tests/Format/Audio/FlacTest.php b/tests/Unit/Format/Audio/FlacTest.php
similarity index 78%
rename from tests/FFMpeg/Tests/Format/Audio/FlacTest.php
rename to tests/Unit/Format/Audio/FlacTest.php
index 6b45226..cbcc2f4 100644
--- a/tests/FFMpeg/Tests/Format/Audio/FlacTest.php
+++ b/tests/Unit/Format/Audio/FlacTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Flac;
 
diff --git a/tests/FFMpeg/Tests/Format/Audio/Mp3Test.php b/tests/Unit/Format/Audio/Mp3Test.php
similarity index 77%
rename from tests/FFMpeg/Tests/Format/Audio/Mp3Test.php
rename to tests/Unit/Format/Audio/Mp3Test.php
index e7125bd..3892013 100644
--- a/tests/FFMpeg/Tests/Format/Audio/Mp3Test.php
+++ b/tests/Unit/Format/Audio/Mp3Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Mp3;
 
diff --git a/tests/FFMpeg/Tests/Format/Audio/VorbisTest.php b/tests/Unit/Format/Audio/VorbisTest.php
similarity index 78%
rename from tests/FFMpeg/Tests/Format/Audio/VorbisTest.php
rename to tests/Unit/Format/Audio/VorbisTest.php
index 7aba0b7..0c92a93 100644
--- a/tests/FFMpeg/Tests/Format/Audio/VorbisTest.php
+++ b/tests/Unit/Format/Audio/VorbisTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Vorbis;
 
diff --git a/tests/FFMpeg/Tests/Format/Audio/WavTest.php b/tests/Unit/Format/Audio/WavTest.php
similarity index 77%
rename from tests/FFMpeg/Tests/Format/Audio/WavTest.php
rename to tests/Unit/Format/Audio/WavTest.php
index 8e0f72c..66bb5b4 100644
--- a/tests/FFMpeg/Tests/Format/Audio/WavTest.php
+++ b/tests/Unit/Format/Audio/WavTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Audio;
+namespace Tests\FFMpeg\Unit\Format\Audio;
 
 use FFMpeg\Format\Audio\Wav;
 
diff --git a/tests/FFMpeg/Tests/Format/ProgressListener/AudioProgressListenerTest.php b/tests/Unit/Format/ProgressListener/AudioProgressListenerTest.php
similarity index 97%
rename from tests/FFMpeg/Tests/Format/ProgressListener/AudioProgressListenerTest.php
rename to tests/Unit/Format/ProgressListener/AudioProgressListenerTest.php
index a227b1e..07fd662 100644
--- a/tests/FFMpeg/Tests/Format/ProgressListener/AudioProgressListenerTest.php
+++ b/tests/Unit/Format/ProgressListener/AudioProgressListenerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\ProgressListener;
+namespace Tests\FFMpeg\Unit\Format\ProgressListener;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Format\ProgressListener\AudioProgressListener;
 use FFMpeg\FFProbe\DataMapping\Format;
 
diff --git a/tests/FFMpeg/Tests/Format/ProgressListener/VideoProgressListenerTest.php b/tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php
similarity index 97%
rename from tests/FFMpeg/Tests/Format/ProgressListener/VideoProgressListenerTest.php
rename to tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php
index 1e6663d..5367399 100644
--- a/tests/FFMpeg/Tests/Format/ProgressListener/VideoProgressListenerTest.php
+++ b/tests/Unit/Format/ProgressListener/VideoProgressListenerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\ProgressListener;
+namespace Tests\FFMpeg\Unit\Format\ProgressListener;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 use FFMpeg\Format\ProgressListener\VideoProgressListener;
 use FFMpeg\FFProbe\DataMapping\Format;
 
diff --git a/tests/FFMpeg/Tests/Format/Video/OggTest.php b/tests/Unit/Format/Video/OggTest.php
similarity index 77%
rename from tests/FFMpeg/Tests/Format/Video/OggTest.php
rename to tests/Unit/Format/Video/OggTest.php
index 16bb2ae..56f03db 100644
--- a/tests/FFMpeg/Tests/Format/Video/OggTest.php
+++ b/tests/Unit/Format/Video/OggTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\Ogg;
 
diff --git a/tests/FFMpeg/Tests/Format/Video/VideoTestCase.php b/tests/Unit/Format/Video/VideoTestCase.php
similarity index 96%
rename from tests/FFMpeg/Tests/Format/Video/VideoTestCase.php
rename to tests/Unit/Format/Video/VideoTestCase.php
index c52b3ae..a62c99f 100644
--- a/tests/FFMpeg/Tests/Format/Video/VideoTestCase.php
+++ b/tests/Unit/Format/Video/VideoTestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
-use FFMpeg\Tests\Format\Audio\AudioTestCase;
+use Tests\FFMpeg\Unit\Format\Audio\AudioTestCase;
 
 abstract class VideoTestCase extends AudioTestCase
 {
diff --git a/tests/FFMpeg/Tests/Format/Video/WMV3Test.php b/tests/Unit/Format/Video/WMV3Test.php
similarity index 78%
rename from tests/FFMpeg/Tests/Format/Video/WMV3Test.php
rename to tests/Unit/Format/Video/WMV3Test.php
index c035c60..edfccd7 100644
--- a/tests/FFMpeg/Tests/Format/Video/WMV3Test.php
+++ b/tests/Unit/Format/Video/WMV3Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\WMV3;
 
diff --git a/tests/FFMpeg/Tests/Format/Video/WMVTest.php b/tests/Unit/Format/Video/WMVTest.php
similarity index 77%
rename from tests/FFMpeg/Tests/Format/Video/WMVTest.php
rename to tests/Unit/Format/Video/WMVTest.php
index 907a068..19921d5 100644
--- a/tests/FFMpeg/Tests/Format/Video/WMVTest.php
+++ b/tests/Unit/Format/Video/WMVTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\WMV;
 
diff --git a/tests/FFMpeg/Tests/Format/Video/WebMTest.php b/tests/Unit/Format/Video/WebMTest.php
similarity index 78%
rename from tests/FFMpeg/Tests/Format/Video/WebMTest.php
rename to tests/Unit/Format/Video/WebMTest.php
index 0ea78ce..47988a8 100644
--- a/tests/FFMpeg/Tests/Format/Video/WebMTest.php
+++ b/tests/Unit/Format/Video/WebMTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\WebM;
 
diff --git a/tests/FFMpeg/Tests/Format/Video/X264Test.php b/tests/Unit/Format/Video/X264Test.php
similarity index 78%
rename from tests/FFMpeg/Tests/Format/Video/X264Test.php
rename to tests/Unit/Format/Video/X264Test.php
index bd5522f..62c7b8e 100644
--- a/tests/FFMpeg/Tests/Format/Video/X264Test.php
+++ b/tests/Unit/Format/Video/X264Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Format\Video;
+namespace Tests\FFMpeg\Unit\Format\Video;
 
 use FFMpeg\Format\Video\X264;
 
diff --git a/tests/FFMpeg/Tests/Media/AbstractMediaTestCase.php b/tests/Unit/Media/AbstractMediaTestCase.php
similarity index 50%
rename from tests/FFMpeg/Tests/Media/AbstractMediaTestCase.php
rename to tests/Unit/Media/AbstractMediaTestCase.php
index c30f198..0b787d9 100644
--- a/tests/FFMpeg/Tests/Media/AbstractMediaTestCase.php
+++ b/tests/Unit/Media/AbstractMediaTestCase.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
-use FFMpeg\Tests\TestCase;
+use Tests\FFMpeg\Unit\TestCase;
 
 abstract class AbstractMediaTestCase extends TestCase
 {
diff --git a/tests/FFMpeg/Tests/Media/AbstractStreamableTestCase.php b/tests/Unit/Media/AbstractStreamableTestCase.php
similarity index 96%
rename from tests/FFMpeg/Tests/Media/AbstractStreamableTestCase.php
rename to tests/Unit/Media/AbstractStreamableTestCase.php
index f6b3c59..c652ef8 100644
--- a/tests/FFMpeg/Tests/Media/AbstractStreamableTestCase.php
+++ b/tests/Unit/Media/AbstractStreamableTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 abstract class AbstractStreamableTestCase extends AbstractMediaTestCase
 {
diff --git a/tests/FFMpeg/Tests/Media/AudioProg.php b/tests/Unit/Media/AudioProg.php
similarity index 82%
rename from tests/FFMpeg/Tests/Media/AudioProg.php
rename to tests/Unit/Media/AudioProg.php
index e4554d4..3765a1b 100644
--- a/tests/FFMpeg/Tests/Media/AudioProg.php
+++ b/tests/Unit/Media/AudioProg.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Format\ProgressableInterface;
 use FFMpeg\Format\AudioInterface;
diff --git a/tests/FFMpeg/Tests/Media/AudioTest.php b/tests/Unit/Media/AudioTest.php
similarity index 98%
rename from tests/FFMpeg/Tests/Media/AudioTest.php
rename to tests/Unit/Media/AudioTest.php
index 68f3754..5120496 100644
--- a/tests/FFMpeg/Tests/Media/AudioTest.php
+++ b/tests/Unit/Media/AudioTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Media\Audio;
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
@@ -218,7 +218,7 @@ class AudioTest extends AbstractStreamableTestCase
 
         $listeners = array($this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface'));
 
-        $progressableFormat = $this->getMockBuilder('FFMpeg\Tests\Media\AudioProg')
+        $progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\AudioProg')
             ->disableOriginalConstructor()->getMock();
         $progressableFormat->expects($this->any())
             ->method('getExtraParams')
diff --git a/tests/FFMpeg/Tests/Media/FrameTest.php b/tests/Unit/Media/FrameTest.php
similarity index 98%
rename from tests/FFMpeg/Tests/Media/FrameTest.php
rename to tests/Unit/Media/FrameTest.php
index 8f9af04..43f70c3 100644
--- a/tests/FFMpeg/Tests/Media/FrameTest.php
+++ b/tests/Unit/Media/FrameTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Media\Frame;
 
diff --git a/tests/FFMpeg/Tests/Media/Prog.php b/tests/Unit/Media/Prog.php
similarity index 81%
rename from tests/FFMpeg/Tests/Media/Prog.php
rename to tests/Unit/Media/Prog.php
index 98c0920..6cdc345 100644
--- a/tests/FFMpeg/Tests/Media/Prog.php
+++ b/tests/Unit/Media/Prog.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Format\ProgressableInterface;
 use FFMpeg\Format\VideoInterface;
diff --git a/tests/FFMpeg/Tests/Media/VideoTest.php b/tests/Unit/Media/VideoTest.php
similarity index 99%
rename from tests/FFMpeg/Tests/Media/VideoTest.php
rename to tests/Unit/Media/VideoTest.php
index 6eecc8c..43af1bb 100644
--- a/tests/FFMpeg/Tests/Media/VideoTest.php
+++ b/tests/Unit/Media/VideoTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests\Media;
+namespace Tests\FFMpeg\Unit\Media;
 
 use FFMpeg\Media\Video;
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
@@ -332,7 +332,7 @@ class VideoTest extends AbstractStreamableTestCase
 
         $listeners = array($this->getMock('Alchemy\BinaryDriver\Listeners\ListenerInterface'));
 
-        $progressableFormat = $this->getMockBuilder('FFMpeg\Tests\Media\Prog')
+        $progressableFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\Prog')
             ->disableOriginalConstructor()->getMock();
         $progressableFormat->expects($this->any())
             ->method('getExtraParams')
@@ -353,7 +353,7 @@ class VideoTest extends AbstractStreamableTestCase
             ->method('getPasses')
             ->will($this->returnValue(2));
 
-        $progressableAudioFormat = $this->getMockBuilder('FFMpeg\Tests\Media\AudioProg')
+        $progressableAudioFormat = $this->getMockBuilder('Tests\FFMpeg\Unit\Media\AudioProg')
             ->disableOriginalConstructor()->getMock();
         $progressableAudioFormat->expects($this->any())
             ->method('getExtraParams')
diff --git a/tests/FFMpeg/Tests/TestCase.php b/tests/Unit/TestCase.php
similarity index 99%
rename from tests/FFMpeg/Tests/TestCase.php
rename to tests/Unit/TestCase.php
index 4757f95..5481599 100644
--- a/tests/FFMpeg/Tests/TestCase.php
+++ b/tests/Unit/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FFMpeg\Tests;
+namespace Tests\FFMpeg\Unit;
 
 class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a6f006d..9611e83 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,8 @@
 <?php
 
-$loader = require __DIR__.'/../vendor/autoload.php';
-$loader->add('FFMpeg\Tests', __DIR__);
-$loader->add('FFMpeg\Functional', __DIR__);
+$file = __DIR__ . '/../vendor/autoload.php';
+if (!file_exists($file)) {
+    throw new RuntimeException('Install dependencies to run test suite.');
+}
+
+$autoload = require_once $file;