diff --git a/library/Icinga/Data/BaseQuery.php b/library/Icinga/Data/BaseQuery.php
index c84c66696..4101b7b5c 100644
--- a/library/Icinga/Data/BaseQuery.php
+++ b/library/Icinga/Data/BaseQuery.php
@@ -2,12 +2,11 @@
 
 namespace Icinga\Data;
 
-use Countable;
 use Zend_Controller_Front;
 use Zend_Paginator;
 use Icinga\Web\Paginator\Adapter\QueryAdapter;
 
-abstract class BaseQuery implements Browsable, Fetchable, Filterable, Limitable, Queryable, Sortable, Countable
+abstract class BaseQuery implements QueryInterface, Queryable
 {
     /**
      * Query data source
diff --git a/library/Icinga/Data/QueryInterface.php b/library/Icinga/Data/QueryInterface.php
new file mode 100644
index 000000000..65612b7ca
--- /dev/null
+++ b/library/Icinga/Data/QueryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Icinga\Data;
+
+use Countable;
+
+interface QueryInterface extends Browsable, Fetchable, Filterable, Limitable, Sortable, Countable {};