diff --git a/Aggregation/DateRangeAggregationTest.php b/Aggregation/DateRangeAggregationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..26081ef0cff2e1a6500e5d5ac54f11b2a69f39b5
--- /dev/null
+++ b/Aggregation/DateRangeAggregationTest.php
@@ -0,0 +1,41 @@
+<?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\Aggregation;
+
+use ONGR\ElasticsearchBundle\DSL\Aggregation\DateRangeAggregation;
+
+class DateRangeAggregationTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test if exception is thrown.
+     *
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Date range aggregation must have field, format set and range added.
+     */
+    public function testIfExceptionIsThrownWhenNoParametersAreSet()
+    {
+        $agg = new DateRangeAggregation('test_agg');
+        $agg->getArray();
+    }
+
+    /**
+     * Test if exception is thrown when both range parameters are null.
+     *
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Either from or to must be set. Both cannot be null.
+     */
+    public function testIfExceptionIsThrownWhenBothRangesAreNull()
+    {
+        $agg = new DateRangeAggregation('test_agg');
+        $agg->addRange(null, null);
+    }
+}
diff --git a/Aggregation/MissingAggregationTest.php b/Aggregation/MissingAggregationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..df8e0b164e36068b38f2d49d4c3cc1b687e808e1
--- /dev/null
+++ b/Aggregation/MissingAggregationTest.php
@@ -0,0 +1,29 @@
+<?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\Aggregation;
+
+use ONGR\ElasticsearchBundle\DSL\Aggregation\MissingAggregation;
+
+class MissingAggregationTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test if exception is thrown when field is not set.
+     *
+     * @expectedException \LogicException
+     * @expectedExceptionMessage Missing aggregation must have a field set.
+     */
+    public function testIfExceptionIsThrown()
+    {
+        $agg = new MissingAggregation('test_agg');
+        $agg->getArray();
+    }
+}