diff --git a/.travis.yml b/.travis.yml
index 20dd9243c0..042287bbca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,8 @@ install:
 - composer install --no-interaction
 before_script:
 - composer pre-test
-- if [ "${coverage}" == "" ]; then php -S localhost:8000 -t httpdocs httpdocs/index.php & fi
-- if [ "${coverage}" != "" ]; then php -S localhost:8000 -t httpdocs httpdocs/coverage.php & fi
+- if [ "${coverage}" == "" ]; then (cd httpdocs/; php -S localhost:8000 -t . index.php &) fi
+- if [ "${coverage}" != "" ]; then (cd httpdocs/; php -S localhost:8000 -t . coverage.php &) fi
 - mysql -e 'SET @@GLOBAL.wait_timeout=1800'
 script:
 - if [ "${coverage}" == "" ]; then composer test; fi
diff --git a/application/classes/Ushahidi/Repository/Post.php b/application/classes/Ushahidi/Repository/Post.php
index 71d432f6d5..a2fe781540 100644
--- a/application/classes/Ushahidi/Repository/Post.php
+++ b/application/classes/Ushahidi/Repository/Post.php
@@ -19,7 +19,6 @@
 use Ushahidi\Core\Entity\PostLockRepository;
 use Ushahidi\Core\Entity\PostValueContainer;
 use Ushahidi\Core\Entity\PostRepository;
-use Ushahidi\Core\Entity\PostSearchData;
 use Ushahidi\Core\Entity\UserRepository;
 use Ushahidi\Core\SearchData;
 use Ushahidi\Core\Usecase\Post\StatsPostRepository;
diff --git a/application/classes/Ushahidi/Validator/Post/Create.php b/application/classes/Ushahidi/Validator/Post/Create.php
index ed780f4ec3..5561f5a120 100644
--- a/application/classes/Ushahidi/Validator/Post/Create.php
+++ b/application/classes/Ushahidi/Validator/Post/Create.php
@@ -18,7 +18,6 @@
 use Ushahidi\Core\Entity\PostRepository;
 use Ushahidi\Core\Entity\RoleRepository;
 use Ushahidi\Core\Entity\PostLockRepository;
-use Ushahidi\Core\Entity\PostSearchData;
 use Ushahidi\Core\Tool\Validator;
 use Ushahidi\Core\Traits\UserContext;
 use Ushahidi\Core\Tool\Permissions\AclTrait;
diff --git a/src/Core/Entity/PostSearchData.php b/src/Core/Entity/PostSearchData.php
deleted file mode 100644
index 78e84e2930..0000000000
--- a/src/Core/Entity/PostSearchData.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * Ushahidi Platform Post Search Data
- *
- * @author     Ushahidi Team <team@ushahidi.com>
- * @package    Ushahidi\Platform
- * @copyright  2014 Ushahidi
- * @license    https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License Version 3 (AGPL3)
- */
-
-namespace Ushahidi\Core\Entity;
-
-use Ushahidi\Core\SearchData;
-use Ushahidi\Core\Traits\Data\SortableData;
-
-class PostSearchData extends SearchData
-{
-	use SortableData;
-
-	public $q; // LIKE title OR content
-	public $id;
-	public $slug;
-	public $parent;
-	public $type;
-	public $form;
-	public $user;
-	public $locale;
-	public $status;
-	public $created_after;
-	public $created_before;
-	public $updated_after;
-	public $updated_before;
-	public $bbox;
-	public $tags;
-	public $values;
-	public $set;
-
-	// center_point & within_km are interdependent
-	public $center_point;
-	public $within_km;
-
-	public $include_types;
-	public $include_attributes;
-}
diff --git a/src/Core/Usecase/Form/SearchFormData.php b/src/Core/Usecase/Form/SearchFormData.php
deleted file mode 100644
index 0b8317e132..0000000000
--- a/src/Core/Usecase/Form/SearchFormData.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Ushahidi Platform Form Search Data
- *
- * @author     Ushahidi Team <team@ushahidi.com>
- * @package    Ushahidi\Platform
- * @copyright  2014 Ushahidi
- * @license    https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License Version 3 (AGPL3)
- */
-
-namespace Ushahidi\Core\Usecase\Form;
-
-use Ushahidi\Core\Data;
-use Ushahidi\Core\SearchData;
-use Ushahidi\Core\Traits\Data\SortableData;
-
-class SearchFormData extends SearchData
-{
-	use SortableData;
-
-	public $q; // LIKE name
-	public $parent;
-}