diff --git a/composer.json b/composer.json
index 0487e13..877e049 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,11 @@
 			"ElasticSearcher\\": ["src"]
 		}
 	},
+	"autoload-dev": {
+		"psr-4": {
+			"ElasticSearcher\\Dummy\\": ["tests/dummy"]
+		}
+	},
 	"require": {
 		"elasticsearch/elasticsearch": "~1.3",
 		"illuminate/support": "^4.2|~5"
diff --git a/tests/Fragments/Traits/PaginatedTraitTest.php b/tests/Fragments/Traits/PaginatedTraitTest.php
index 82b42f3..68c9792 100644
--- a/tests/Fragments/Traits/PaginatedTraitTest.php
+++ b/tests/Fragments/Traits/PaginatedTraitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use ElasticSearcher\Dummy\Queries\PaginatedMoviesFrom2014Query;
+
 class PaginatedTraitTest extends ElasticSearcherTestCase
 {
 	public function testPaginating()
diff --git a/tests/Fragments/Traits/SortableTraitTest.php b/tests/Fragments/Traits/SortableTraitTest.php
index 93a4616..2d2d22c 100644
--- a/tests/Fragments/Traits/SortableTraitTest.php
+++ b/tests/Fragments/Traits/SortableTraitTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use ElasticSearcher\Dummy\Queries\SortedQuery;
+
 class SortableTraitTest extends ElasticSearcherTestCase
 {
 	public function testSettingSortingFields()
diff --git a/tests/Managers/DocumentsManagerTest.php b/tests/Managers/DocumentsManagerTest.php
index 5031a88..87301f4 100644
--- a/tests/Managers/DocumentsManagerTest.php
+++ b/tests/Managers/DocumentsManagerTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use ElasticSearcher\Managers\DocumentsManager;
+use ElasticSearcher\Dummy\Indexes\MoviesIndex;
 
 class DocumentsManagerTest extends ElasticSearcherTestCase
 {
diff --git a/tests/Managers/IndicesManagerTest.php b/tests/Managers/IndicesManagerTest.php
index 8fcb84d..7dfc241 100644
--- a/tests/Managers/IndicesManagerTest.php
+++ b/tests/Managers/IndicesManagerTest.php
@@ -1,6 +1,8 @@
 <?php
 
 use ElasticSearcher\Managers\IndicesManager;
+use ElasticSearcher\Dummy\Indexes\AuthorsIndex;
+use ElasticSearcher\Dummy\Indexes\MoviesIndex;
 
 class IndicesManagerTest extends ElasticSearcherTestCase
 {
diff --git a/tests/Parsers/FragmentParserTest.php b/tests/Parsers/FragmentParserTest.php
index 59664c9..14406bb 100644
--- a/tests/Parsers/FragmentParserTest.php
+++ b/tests/Parsers/FragmentParserTest.php
@@ -3,6 +3,7 @@
 use ElasticSearcher\Parsers\FragmentParser;
 use ElasticSearcher\Fragments\Filters\TermFilter;
 use ElasticSearcher\Fragments\Analyzers\StandardAnalyzer;
+use ElasticSearcher\Dummy\Fragments\Filters\IDFilter;
 
 class FragmentParserTest extends ElasticSearcherTestCase
 {
diff --git a/tests/Queries/QueryTest.php b/tests/Queries/QueryTest.php
index 4a429c2..d78d166 100644
--- a/tests/Queries/QueryTest.php
+++ b/tests/Queries/QueryTest.php
@@ -1,5 +1,11 @@
 <?php
 
+use ElasticSearcher\Dummy\Indexes\MoviesIndex;
+use ElasticSearcher\Dummy\Queries\MoviesFrom2014Query;
+use ElasticSearcher\Dummy\Queries\MoviesFromXYearQuery;
+use ElasticSearcher\Dummy\Queries\MovieWithIDXQuery;
+use ElasticSearcher\Dummy\Queries\CountMoviesFrom2014Query;
+
 class QueryTest extends ElasticSearcherTestCase
 {
 	public function setUp()
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6c59ff5..4bd6416 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,15 +2,6 @@
 
 require __DIR__.'/../vendor/autoload.php';
 require __DIR__.'/ElasticSearcherTestCase.php';
-require __DIR__.'/dummy/Indexes/MoviesIndex.php';
-require __DIR__.'/dummy/Indexes/AuthorsIndex.php';
-require __DIR__.'/dummy/Queries/MoviesFrom2014Query.php';
-require __DIR__.'/dummy/Queries/MoviesFromXYearQuery.php';
-require __DIR__.'/dummy/Queries/MovieWithIDXQuery.php';
-require __DIR__.'/dummy/Queries/CountMoviesFrom2014Query.php';
-require __DIR__.'/dummy/Queries/PaginatedMoviesFrom2014Query.php';
-require __DIR__.'/dummy/Queries/SortedQuery.php';
-require __DIR__.'/dummy/Fragments/Filters/IDFilter.php';
 
 // Test host (should be inside the vagrant box).
 define('ELASTICSEARCH_HOST', 'localhost:9200');
diff --git a/tests/dummy/Fragments/Filters/IDFilter.php b/tests/dummy/Fragments/Filters/IDFilter.php
index 85d98e8..24a6751 100644
--- a/tests/dummy/Fragments/Filters/IDFilter.php
+++ b/tests/dummy/Fragments/Filters/IDFilter.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Fragments\Filters;
+
 use ElasticSearcher\Abstracts\AbstractFragment;
 use ElasticSearcher\Fragments\Filters\TermFilter;
 
diff --git a/tests/dummy/Indexes/AuthorsIndex.php b/tests/dummy/Indexes/AuthorsIndex.php
index ac2dc2f..9e995fa 100644
--- a/tests/dummy/Indexes/AuthorsIndex.php
+++ b/tests/dummy/Indexes/AuthorsIndex.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Indexes;
+
 use ElasticSearcher\Abstracts\AbstractIndex;
 
 class AuthorsIndex extends AbstractIndex
diff --git a/tests/dummy/Indexes/MoviesIndex.php b/tests/dummy/Indexes/MoviesIndex.php
index a59573a..1d58501 100644
--- a/tests/dummy/Indexes/MoviesIndex.php
+++ b/tests/dummy/Indexes/MoviesIndex.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Indexes;
+
 use ElasticSearcher\Abstracts\AbstractIndex;
 
 class MoviesIndex extends AbstractIndex
diff --git a/tests/dummy/Queries/CountMoviesFrom2014Query.php b/tests/dummy/Queries/CountMoviesFrom2014Query.php
index 3fdb9c4..f907ba9 100644
--- a/tests/dummy/Queries/CountMoviesFrom2014Query.php
+++ b/tests/dummy/Queries/CountMoviesFrom2014Query.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Queries;
+
 use ElasticSearcher\Abstracts\AbstractQuery;
 use ElasticSearcher\Fragments\Filters\TermFilter;
 
diff --git a/tests/dummy/Queries/MovieWithIDXQuery.php b/tests/dummy/Queries/MovieWithIDXQuery.php
index 453c644..1ecce59 100644
--- a/tests/dummy/Queries/MovieWithIDXQuery.php
+++ b/tests/dummy/Queries/MovieWithIDXQuery.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Queries;
+
 use ElasticSearcher\Abstracts\AbstractQuery;
+use ElasticSearcher\Dummy\Fragments\Filters\IDFilter;
 
 class MovieWithIDXQuery extends AbstractQuery
 {
diff --git a/tests/dummy/Queries/MoviesFrom2014Query.php b/tests/dummy/Queries/MoviesFrom2014Query.php
index aa4cacd..fe833cc 100644
--- a/tests/dummy/Queries/MoviesFrom2014Query.php
+++ b/tests/dummy/Queries/MoviesFrom2014Query.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Queries;
+
 use ElasticSearcher\Abstracts\AbstractQuery;
 use ElasticSearcher\Fragments\Filters\TermFilter;
 
diff --git a/tests/dummy/Queries/MoviesFromXYearQuery.php b/tests/dummy/Queries/MoviesFromXYearQuery.php
index eb872ec..8b92e39 100644
--- a/tests/dummy/Queries/MoviesFromXYearQuery.php
+++ b/tests/dummy/Queries/MoviesFromXYearQuery.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Queries;
+
 use ElasticSearcher\Abstracts\AbstractQuery;
 use ElasticSearcher\Fragments\Filters\TermFilter;
 
diff --git a/tests/dummy/Queries/PaginatedMoviesFrom2014Query.php b/tests/dummy/Queries/PaginatedMoviesFrom2014Query.php
index 335b6d1..e6dfecc 100644
--- a/tests/dummy/Queries/PaginatedMoviesFrom2014Query.php
+++ b/tests/dummy/Queries/PaginatedMoviesFrom2014Query.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Queries;
+
 use ElasticSearcher\Abstracts\AbstractQuery;
 use ElasticSearcher\Fragments\Traits\PaginatedTrait;
 
diff --git a/tests/dummy/Queries/SortedQuery.php b/tests/dummy/Queries/SortedQuery.php
index b772b5e..9878274 100644
--- a/tests/dummy/Queries/SortedQuery.php
+++ b/tests/dummy/Queries/SortedQuery.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace ElasticSearcher\Dummy\Queries;
+
 use ElasticSearcher\Abstracts\AbstractQuery;
 use ElasticSearcher\Fragments\Traits\SortableTrait;