diff --git a/framework/db/dao/BaseQuery.php b/framework/db/dao/BaseQuery.php
index 2969490..717ed06 100644
--- a/framework/db/dao/BaseQuery.php
+++ b/framework/db/dao/BaseQuery.php
@@ -16,7 +16,7 @@ namespace yii\db\dao;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class BaseQuery extends \yii\base\Object
+class BaseQuery extends \yii\base\Component
 {
 	/**
 	 * @var string|array the columns being selected. This refers to the SELECT clause in a SQL
diff --git a/tests/unit/data/ar/Customer.php b/tests/unit/data/ar/Customer.php
index b2a0907..4e8215e 100644
--- a/tests/unit/data/ar/Customer.php
+++ b/tests/unit/data/ar/Customer.php
@@ -25,7 +25,7 @@ class Customer extends ActiveRecord
 	{
 		return array(
 			'active' => function($q) {
-				return $q->andWhere('@.`status` = ' . Customer::STATUS_ACTIVE);
+				return $q->andWhere('@.`status` = ' . self::STATUS_ACTIVE);
 			},
 		);
 	}