diff --git a/.drone.yml b/.drone.yml
index 8d3e3551a6..dd4ec40420 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -30,7 +30,6 @@ pipeline:
     image: nextcloudci/php7.0:php7.0-7
     commands:
       - ./occ app:check-code admin_audit
-      - ./occ app:check-code bruteforcesettings
       - ./occ app:check-code comments
       - ./occ app:check-code federation
       - ./occ app:check-code sharebymail
diff --git a/.gitignore b/.gitignore
index 1e0f53a3c0..6a8e672337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@
 /apps/files_external/3rdparty/irodsphp/prods/tutorials
 /apps/files_external/3rdparty/irodsphp/prods/test*
 /apps/files_external/tests/config.*.php
-!/apps/bruteforcesettings
 
 
 # ignore themes except the example and the README
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 856d17e5c1..ad9d901d05 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -282,7 +282,6 @@ Feature: provisioning
 		Then the OCS status code should be "100"
 		And the HTTP status code should be "200"
 		And apps returned are
-			| bruteforcesettings |
 			| comments |
 			| dav |
 			| federatedfilesharing |
diff --git a/core/shipped.json b/core/shipped.json
index 5bbf79aec8..679e1c7f70 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -42,7 +42,6 @@
     "workflowengine"
   ],
   "alwaysEnabled": [
-    "bruteforcesettings",
     "files",
     "dav",
     "federatedfilesharing",
diff --git a/tests/karma.config.js b/tests/karma.config.js
index f965738872..91052f62cd 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -118,19 +118,6 @@ module.exports = function(config) {
 					'settings/tests/js/appsSpec.js',
 					'settings/tests/js/users/deleteHandlerSpec.js'
 				]
-			},
-			{
-				name: 'bruteforcesettings',
-				srcFiles: [
-					// need to enforce loading order...
-					'apps/bruteforcesettings/js/IPWhitelistModel.js',
-					'apps/bruteforcesettings/js/IPWhitelistCollection.js',
-					'apps/bruteforcesettings/js/IPWhitelistView.js',
-					'apps/bruteforcesettings/js/IPWhitelist.js',
-				],
-				testFiles: [
-					'apps/bruteforcesettings/tests/js/IPWhitelistSpec.js'
-				]
 			}
 		];
 	}
diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php
index 26489cb5b0..bfb2893955 100644
--- a/tests/lib/App/AppManagerTest.php
+++ b/tests/lib/App/AppManagerTest.php
@@ -329,7 +329,6 @@ class AppManagerTest extends TestCase {
 		$this->appConfig->setValue('test2', 'enabled', 'no');
 		$this->appConfig->setValue('test3', 'enabled', '["foo"]');
 		$apps = [
-			'bruteforcesettings',
 			'dav',
 			'federatedfilesharing',
 			'files',
@@ -355,7 +354,6 @@ class AppManagerTest extends TestCase {
 		$this->appConfig->setValue('test3', 'enabled', '["foo"]');
 		$this->appConfig->setValue('test4', 'enabled', '["asd"]');
 		$enabled = [
-			'bruteforcesettings',
 			'dav',
 			'federatedfilesharing',
 			'files',
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 40633aff5a..9a9c9c957e 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -21,7 +21,6 @@
 			<directory suffix=".php">..</directory>
 			<exclude>
 				<directory suffix=".php">../3rdparty</directory>
-				<directory suffix=".php">../apps/bruteforcesettings/tests</directory>
 				<directory suffix=".php">../apps/dav/tests</directory>
 				<directory suffix=".php">../apps/encryption/tests</directory>
 				<directory suffix=".php">../apps/federatedfilesharing/tests</directory>