diff --git a/module/VuFind/src/VuFind/Controller/EITrecordController.php b/module/VuFind/src/VuFind/Controller/EITrecordController.php
index 49a82660b44ae7d92e5f140b503efc9b3222b048..2fbd3d6c20acb0470150dd281b7da28258839994 100644
--- a/module/VuFind/src/VuFind/Controller/EITrecordController.php
+++ b/module/VuFind/src/VuFind/Controller/EITrecordController.php
@@ -27,7 +27,6 @@
* @link http://vufind.org Main Site
*/
namespace VuFind\Controller;
-use Zend\Mvc\MvcEvent;
/**
* EIT Record Controller
diff --git a/module/VuFind/src/VuFind/Controller/EdsController.php b/module/VuFind/src/VuFind/Controller/EdsController.php
index e554a26e2f28d85368a4a23402183103cf7f962f..a48d3ae95c88a6b9da573804db17aa0a5fbd0678 100644
--- a/module/VuFind/src/VuFind/Controller/EdsController.php
+++ b/module/VuFind/src/VuFind/Controller/EdsController.php
@@ -27,7 +27,6 @@
*/
namespace VuFind\Controller;
-use EBSCO\EdsApi\Zend2 as EdsApi;
use VuFind\Solr\Utils as SolrUtils;
/**
* EDS Controller
diff --git a/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php b/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
index b765b532ac2fd5cf2f484614306c195a9f1891b3..eff244f722029eb0240abfb9ade0806ced70fe8b 100644
--- a/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
+++ b/module/VuFind/src/VuFind/Db/Table/UserStatsFields.php
@@ -27,7 +27,6 @@
*/
namespace VuFind\Db\Table;
-use Zend\Db\Sql\Expression;
/**
* Table Definition for statistics
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
index 4820df24b3dcc252a8b71d7fcf9897c317a91d6d..d07107c515ff23fe92bbc44bbe3ffccfcf739cc2 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Aleph.php
@@ -37,8 +37,6 @@
*/
namespace VuFind\ILS\Driver;
use VuFind\Exception\ILS as ILSException;
-use VuFindHttp\HttpServiceInterface;
-use DateTime;
use VuFind\Exception\Date as DateException;
/**
diff --git a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
index 33d2076292a503b7b642f9e809afb2005fea6783..3a03c59be99c03f2edaabc0469566b24986debc3 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/LBS4.php
@@ -26,7 +26,6 @@
namespace VuFind\ILS\Driver;
use VuFind\Exception\ILS as ILSException;
use VuFind\I18n\Translator\TranslatorAwareInterface;
-use VuFind\ILS\Driver\AbstractBase as AbstractBase;
/**
* VuFind Connector for OCLC LBS4
diff --git a/module/VuFind/src/VuFind/Recommend/SpellingSuggestions.php b/module/VuFind/src/VuFind/Recommend/SpellingSuggestions.php
index c9842f0163917f8207e55b62f35f3331f5e71ccc..b123d0d33e422a5f306543bdb39a810f2e8241cf 100644
--- a/module/VuFind/src/VuFind/Recommend/SpellingSuggestions.php
+++ b/module/VuFind/src/VuFind/Recommend/SpellingSuggestions.php
@@ -27,7 +27,6 @@
* @link http://vufind.org/wiki/vufind2:recommendation_modules Wiki
*/
namespace VuFind\Recommend;
-use VuFind\Search\BackendManager;
/**
* SpellingSuggestions Recommendations Module
diff --git a/module/VuFind/src/VuFind/Search/EDS/Options.php b/module/VuFind/src/VuFind/Search/EDS/Options.php
index 6643337ce346a6536f99083a6a93ff952d91f90c..e71d116610de1057dfd22f72a4075db6e799ed35 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Options.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Options.php
@@ -27,7 +27,6 @@
*/
namespace VuFind\Search\EDS;
-use VuFindSearch\ParamBag;
/**
* EDS API Options
diff --git a/module/VuFind/src/VuFind/Search/EDS/Params.php b/module/VuFind/src/VuFind/Search/EDS/Params.php
index 25f4639b86083a2ceea05d94361e8f596414f7a4..b627c9de7d4e146c89eacfcd28fe23eb68c0abb8 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Params.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Params.php
@@ -28,7 +28,6 @@
namespace VuFind\Search\EDS;
use VuFindSearch\ParamBag;
use VuFindSearch\Backend\EDS\SearchRequestModel as SearchRequestModel;
-use VuFind\Search\EDS\QueryAdapter;
/**
* EDS API Params
diff --git a/module/VuFind/src/VuFind/Search/EDS/Results.php b/module/VuFind/src/VuFind/Search/EDS/Results.php
index 20ed0de7055d776fcbc96e18614b66a61126f235..2d0773c5f3410ad40854cdf26fe55a357d7c9f40 100644
--- a/module/VuFind/src/VuFind/Search/EDS/Results.php
+++ b/module/VuFind/src/VuFind/Search/EDS/Results.php
@@ -28,8 +28,6 @@
namespace VuFind\Search\EDS;
use EBSCO\EdsApi\SearchCriteria;
-use VuFindSearch\ParamBag;
-use Zend\Log\LoggerInterface;
/**
* EDS API Results
diff --git a/module/VuFind/src/VuFind/Search/Factory/SolrDefaultBackendFactory.php b/module/VuFind/src/VuFind/Search/Factory/SolrDefaultBackendFactory.php
index 90d5f6b75d8a7c1b62419f8cfed38fb5894108a3..526546a9ff257f746921b7a8b15913a2b57955a9 100644
--- a/module/VuFind/src/VuFind/Search/Factory/SolrDefaultBackendFactory.php
+++ b/module/VuFind/src/VuFind/Search/Factory/SolrDefaultBackendFactory.php
@@ -28,13 +28,11 @@
*/
namespace VuFind\Search\Factory;
-use VuFind\RecordDriver\PluginManager;
use VuFindSearch\Backend\Solr\Response\Json\RecordCollectionFactory;
use VuFindSearch\Backend\Solr\Connector;
use VuFindSearch\Backend\Solr\Backend;
-use VuFind\Search\Listener\NormalizeSolrSort;
/**
* Factory for the default SOLR backend.
diff --git a/module/VuFind/src/VuFind/Search/Factory/SolrStatsBackendFactory.php b/module/VuFind/src/VuFind/Search/Factory/SolrStatsBackendFactory.php
index 60d3aa6f8da9d70c489283975a63d034eacf780b..0767206d7b31ff22c2072d064cde328955a2b810 100644
--- a/module/VuFind/src/VuFind/Search/Factory/SolrStatsBackendFactory.php
+++ b/module/VuFind/src/VuFind/Search/Factory/SolrStatsBackendFactory.php
@@ -28,13 +28,9 @@
*/
namespace VuFind\Search\Factory;
-use VuFind\RecordDriver\PluginManager;
-use VuFindSearch\Backend\Solr\Response\Json\RecordCollectionFactory;
-use VuFindSearch\Backend\Solr\Connector;
use VuFindSearch\Backend\Solr\Backend;
-use VuFind\Search\Listener\NormalizeSolrSort;
/**
* Factory for the default SOLR backend.
diff --git a/module/VuFind/src/VuFind/Search/Minified.php b/module/VuFind/src/VuFind/Search/Minified.php
index a148a120430a33ba7a74e42d5134153351141170..eb75470c6b6cb8c52f69dbf40de4e7f585a9b840 100644
--- a/module/VuFind/src/VuFind/Search/Minified.php
+++ b/module/VuFind/src/VuFind/Search/Minified.php
@@ -26,7 +26,6 @@
* @link http://vufind.org/wiki/vufind2:developer_manual Wiki
*/
namespace VuFind\Search;
-use VuFind\Search\QueryAdapter;
/**
* A minified search object used exclusively for trimming a search object down to its
diff --git a/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php b/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php
index 2dbba2e759e1d1ef0f2517d943b494cbd175fdee..52f39d75caad886990aa2afe739ddd72387e4350 100644
--- a/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php
+++ b/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php
@@ -27,7 +27,6 @@
*/
namespace VuFind\Search\Solr;
-use Zend\Mvc\Controller\AbstractActionController;
/**
* Functions for manipulating facets
diff --git a/module/VuFind/tests/bootstrap.php b/module/VuFind/tests/bootstrap.php
index d69ca1e6ed351d07c1a58ff53aabd00a5377c380..fb7be96e1be728b93ff95b689307e360d12d705c 100644
--- a/module/VuFind/tests/bootstrap.php
+++ b/module/VuFind/tests/bootstrap.php
@@ -1,7 +1,4 @@
<?php
-use Zend\Loader\AutoloaderFactory;
-use Zend\ServiceManager\ServiceManager;
-use Zend\Mvc\Service\ServiceManagerConfig;
// Set flag that we're in test mode
define('VUFIND_PHPUNIT_RUNNING', 1);
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
index 534e2b153044d1327536549bbe53d660414fa1ec..b25f3580195e84f947d158379523ac0ee5f2f301 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/ILS/Driver/MultiBackendTest.php
@@ -29,8 +29,6 @@
*/
namespace VuFindTest\ILS\Driver;
use VuFind\ILS\Driver\MultiBackend, VuFind\Config\Reader as ConfigReader;
-use VuFind\Auth\MultiAuth;
-use Zend\Log\Writer\WriterInterface;
use Zend\Log\Writer\Mock;
use Zend\Log\Logger;
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/HierarchicalFacetHelperTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/HierarchicalFacetHelperTest.php
index a4431df085472fb2f1bc9c9a8400c47e4f11bb66..5357d76ad3e10be4b5ae2b61a69e072ddc5ed140 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/HierarchicalFacetHelperTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Search/Solr/HierarchicalFacetHelperTest.php
@@ -30,7 +30,6 @@
namespace VuFindTest\Search\Solr;
use VuFindTest\Unit\TestCase;
-use Zend\EventManager\Event;
use VuFind\Search\Solr\HierarchicalFacetHelper;
/**
diff --git a/module/VuFindSearch/Module.php b/module/VuFindSearch/Module.php
index aa9d3122c4d4629a5d47a8334b80e6b6e5a5d19c..ae7d99a92402f7c3b757d70b8affc0807af27e38 100644
--- a/module/VuFindSearch/Module.php
+++ b/module/VuFindSearch/Module.php
@@ -29,8 +29,6 @@
namespace VuFindSearch;
-use Zend\ServiceManager\ServiceManager;
-use Zend\EventManager\EventManager;
/**
* ZF2 module definition for the VF2 search service.
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/AbstractBackend.php b/module/VuFindSearch/src/VuFindSearch/Backend/AbstractBackend.php
index 438badc801d1f044fddc1b7a6012c717962888db..8895dfff766a26982614e5d6d5acfbf6391c3b94 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/AbstractBackend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/AbstractBackend.php
@@ -30,7 +30,6 @@ namespace VuFindSearch\Backend;
use VuFindSearch\Response\RecordCollectionInterface;
use VuFindSearch\Response\RecordCollectionFactoryInterface;
-use VuFindSearch\Backend\BackendInterface;
use Zend\Log\LoggerAwareInterface;
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
index 1b3e00ad2aa04281d400facf442dd5cd75e65df5..81910efa6ebc63424bc5e2db83a829e6625989ec 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Backend.php
@@ -39,9 +39,6 @@ use VuFindSearch\Response\RecordCollectionFactoryInterface;
use VuFindSearch\Backend\AbstractBackend;
use VuFindSearch\Backend\Exception\BackendException;
-use Zend\Log\LoggerInterface;
-use VuFindSearch\Backend\EDS\Response\RecordCollection;
-use VuFindSearch\Backend\EDS\Response\RecordCollectionFactory;
use Zend\Cache\Storage\Adapter\AbstractAdapter as CacheAdapter;
use Zend\Config\Config;
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Response/RecordCollectionFactory.php b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Response/RecordCollectionFactory.php
index 6be87d0e092f10a23ca21e402928f5d0d5399423..3dc58315aa1b5d1bf49d9d9e1c82ab63e930cef0 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Response/RecordCollectionFactory.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/EDS/Response/RecordCollectionFactory.php
@@ -29,7 +29,6 @@ namespace VuFindSearch\Backend\EDS\Response;
use VuFindSearch\Response\RecordCollectionFactoryInterface;
use VuFindSearch\Exception\InvalidArgumentException;
-use VuFindSearch\Backend\EDS\Response\RecordCollection;
/**
* Factory for record collection.
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
index 1029c535aa5cf6177cf2132a9c75855a33c63c1a..c3eb4fd8c37ef73dfb1f9fdf63eb97e962c80e6f 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
@@ -31,8 +31,6 @@
namespace VuFindSearch\Backend\Solr;
-use VuFindSearch\Query\AbstractQuery;
-use VuFindSearch\Query\QueryGroup;
use VuFindSearch\Query\Query;
use VuFindSearch\ParamBag;
@@ -46,7 +44,6 @@ use Zend\Http\Client as HttpClient;
use Zend\Http\Client\Adapter\AdapterInterface;
use InvalidArgumentException;
-use XMLWriter;
/**
* SOLR connector.
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
index 8692b027bffa78a91c683dc726189ec65a1dc13a..6ddf58dc9c544d04190edf7cde540b4f5b895e17 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/CommitDocument.php
@@ -29,8 +29,6 @@
namespace VuFindSearch\Backend\Solr\Document;
-use VuFindSearch\Backend\Solr\Record\SerializableRecordInterface;
-use VuFindSearch\Response\RecordInterface;
use XMLWriter;
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
index abf0358c2d9fe758133dd6906ed2faed6d5cd2fd..fa645eec9e0bb1b10441e3a19a9636425f65577a 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/OptimizeDocument.php
@@ -29,8 +29,6 @@
namespace VuFindSearch\Backend\Solr\Document;
-use VuFindSearch\Backend\Solr\Record\SerializableRecordInterface;
-use VuFindSearch\Response\RecordInterface;
use XMLWriter;
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php
index d04a336399a970fd455e30c69826701e6a46d1ae..45ac443126543749d24a13439fa9cc3fcbca4b8d 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/Solr/Document/UpdateDocument.php
@@ -30,7 +30,6 @@
namespace VuFindSearch\Backend\Solr\Document;
use VuFindSearch\Backend\Solr\Record\SerializableRecordInterface;
-use VuFindSearch\Response\RecordInterface;
use SplObjectStorage;
use XMLWriter;
diff --git a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php
index e67cec99744d23deadb3cdeb4e75100b64263911..e9e595fbfd7413427a1eb118cb5820cc10141829 100644
--- a/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php
+++ b/module/VuFindSearch/src/VuFindSearch/Backend/WorldCat/Connector.php
@@ -27,7 +27,6 @@
* @link http://vufind.org/wiki/vufind2:developer_manual Wiki
*/
namespace VuFindSearch\Backend\WorldCat;
-use VuFindSearch\Query\AbstractQuery;
use VuFindSearch\ParamBag;
/**
diff --git a/module/VuFindSearch/src/VuFindSearch/Feature/RetrieveBatchInterface.php b/module/VuFindSearch/src/VuFindSearch/Feature/RetrieveBatchInterface.php
index 75704dda17e940cf20109de8d0414b46ff2d5555..c8ef2b12417f8aaffe2d58f799b9d8a435be2f39 100644
--- a/module/VuFindSearch/src/VuFindSearch/Feature/RetrieveBatchInterface.php
+++ b/module/VuFindSearch/src/VuFindSearch/Feature/RetrieveBatchInterface.php
@@ -29,9 +29,6 @@
namespace VuFindSearch\Feature;
-use VuFindSearch\Query\AbstractQuery;
-use VuFindSearch\Query\QueryGroup;
-use VuFindSearch\Query\Query;
use VuFindSearch\ParamBag;
diff --git a/module/VuFindSearch/src/VuFindSearch/Response/AbstractRecordCollection.php b/module/VuFindSearch/src/VuFindSearch/Response/AbstractRecordCollection.php
index fbbcb540c0b9e14ffd6070b35bb5f9a0f339727a..d7b186b514499346a13117dbd1fc56c4411e7b8a 100644
--- a/module/VuFindSearch/src/VuFindSearch/Response/AbstractRecordCollection.php
+++ b/module/VuFindSearch/src/VuFindSearch/Response/AbstractRecordCollection.php
@@ -29,8 +29,6 @@
namespace VuFindSearch\Response;
-use VuFindSearch\Response\RecordCollectionInterface;
-use VuFindSearch\Response\RecordInterface;
/**
* Abstract record collection (implements some shared low-level functionality).
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php
index 0ff9eaaebc5cbc421cff5f31b5e3e83cca0b25d7..b7d6be2e37182c3c9f7b5ed51fc637c503a2308d 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EDS/BackendTest.php
@@ -31,9 +31,7 @@ namespace VuFindTest\Backend\EDS;
use VuFindSearch\Backend\EDS\Backend;
use VuFindSearch\Backend\EDS\Response\RecordCollectionFactory;
-use VuFindSearch\ParamBag;
use VuFindSearch\Query\Query;
-use PHPUnit_Framework_TestCase;
use InvalidArgumentException;
/**
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php
index 45b3c72d48563078afc0a370ba1e6b587c1c1ee2..e05f21d569e42c04a6bd04d9452706af6a06a4cd 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/EIT/BackendTest.php
@@ -32,9 +32,7 @@ namespace VuFindTest\Backend\EIT;
use VuFindSearch\Backend\EIT\Backend;
use VuFindSearch\Backend\EIT\QueryBuilder;
use VuFindSearch\Backend\EIT\Response\RecordCollectionFactory;
-use VuFindSearch\ParamBag;
use VuFindSearch\Query\Query;
-use PHPUnit_Framework_TestCase;
use InvalidArgumentException;
/**
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php
index 5d0b764304c1da4ea21e6d4b271ea4df076d9112..c633f6bbd004d24ca36b602192fdf5e07ed194a7 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/LibGuides/BackendTest.php
@@ -37,7 +37,6 @@ use Zend\Http\Client\Adapter\Test as TestAdapter;
use Zend\Http\Client as HttpClient;
use VuFindSearch\ParamBag;
use VuFindSearch\Query\Query;
-use PHPUnit_Framework_TestCase;
use InvalidArgumentException;
/**
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php
index 9f1dbf23aba38071f517adf87e6ea8945ef1743c..a0b4d9d2639f061751091811e06278ff8e312b48 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/Primo/BackendTest.php
@@ -30,10 +30,8 @@
namespace VuFindTest\Backend\Primo;
use VuFindSearch\Backend\Primo\Backend;
-use VuFindSearch\Backend\Primo\Response\RecordCollectionFactory;
use VuFindSearch\ParamBag;
use VuFindSearch\Query\Query;
-use PHPUnit_Framework_TestCase;
use InvalidArgumentException;
/**
diff --git a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/BackendTest.php b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/BackendTest.php
index a148f030e3e3bf8826ef9676df03fb327b063006..558f51dffdfbaaaa732f6a491ae48f57803f9a75 100644
--- a/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/BackendTest.php
+++ b/module/VuFindSearch/tests/unit-tests/src/VuFindTest/Backend/WorldCat/BackendTest.php
@@ -30,8 +30,6 @@
namespace VuFindTest\Backend\WorldCat;
use VuFindSearch\Backend\WorldCat\Backend;
-use VuFindSearch\Backend\WorldCat\Response\XML\RecordCollectionFactory;
-use VuFindSearch\ParamBag;
use VuFindSearch\Query\Query;
use PHPUnit_Framework_TestCase;
use InvalidArgumentException;