diff --git a/DslTypeAwareTraitTest.php b/DslTypeAwareTraitTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..921620ea1716ab2ba98c4906c070277ed9713781
--- /dev/null
+++ b/DslTypeAwareTraitTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <info@nfq.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL;
+
+use ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait;
+
+/**
+ * Test for DslTypeAwareTrait.
+ */
+class DslTypeAwareTraitTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var DslTypeAwareTrait
+     */
+    private $mock;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setUp()
+    {
+        $this->mock = $this->getMockForTrait('ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait');
+    }
+
+    /**
+     * Tests if setDslType throws exception.
+     *
+     * @expectedException \InvalidArgumentException
+     */
+    public function testIfSetDslTypeExceptionThrowsException()
+    {
+        $this->mock->setDslType('foo');
+    }
+
+    /**
+     * Tests if setDslType sets filter.
+     */
+    public function testIfSetDslTypeSetsFilter()
+    {
+        $this->mock->setDslType('filter');
+        $this->assertEquals('filter', $this->mock->getDslType());
+    }
+
+    /**
+     * Tests if setDslType sets query.
+     */
+    public function testIfSetDslTypeSetsQuery()
+    {
+        $this->mock->setDslType('query');
+        $this->assertEquals('query', $this->mock->getDslType());
+    }
+}