diff --git a/tests/Core/Command/User/DisableTest.php b/tests/Core/Command/User/DisableTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..758020acc71a4a3f13a62d08b5eb15ead3542707
--- /dev/null
+++ b/tests/Core/Command/User/DisableTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace Tests\Core\Command\User;
+
+
+use OC\Core\Command\User\Disable;
+use OCP\IUser;
+use OCP\IUserManager;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Test\TestCase;
+
+class DisableTest extends TestCase {
+	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
+	/** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var Disable */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->userManager = $this->createMock(IUserManager::class);
+		$this->consoleInput = $this->createMock(InputInterface::class);
+		$this->consoleOutput = $this->createMock(OutputInterface::class);
+
+		$this->command = new Disable($this->userManager);
+	}
+
+	public function testValidUser() {
+		$user = $this->createMock(IUser::class);
+		$user->expects($this->once())
+			->method('setEnabled')
+			->with(false);
+
+		$this->userManager
+			->method('get')
+			->with('user')
+			->willReturn($user);
+
+		$this->consoleInput
+			->method('getArgument')
+			->with('uid')
+			->willReturn('user');
+
+		$this->consoleOutput->expects($this->once())
+			->method('writeln')
+			->with($this->stringContains('The specified user is disabled'));
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testInvalidUser() {
+		$this->userManager->expects($this->once())
+			->method('get')
+			->with('user')
+			->willReturn(null);
+
+		$this->consoleInput
+			->method('getArgument')
+			->with('uid')
+			->willReturn('user');
+
+		$this->consoleOutput->expects($this->once())
+			->method('writeln')
+			->with($this->stringContains('User does not exist'));
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}
diff --git a/tests/Core/Command/User/EnableTest.php b/tests/Core/Command/User/EnableTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..60b415ae79db0f315cc97e577757a4bc3b640ad3
--- /dev/null
+++ b/tests/Core/Command/User/EnableTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace Tests\Core\Command\User;
+
+
+use OC\Core\Command\User\Enable;
+use OCP\IUser;
+use OCP\IUserManager;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Test\TestCase;
+
+class EnableTest extends TestCase {
+	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
+	/** @var InputInterface|\PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var Disable */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->userManager = $this->createMock(IUserManager::class);
+		$this->consoleInput = $this->createMock(InputInterface::class);
+		$this->consoleOutput = $this->createMock(OutputInterface::class);
+
+		$this->command = new Enable($this->userManager);
+	}
+
+	public function testValidUser() {
+		$user = $this->createMock(IUser::class);
+		$user->expects($this->once())
+			->method('setEnabled')
+			->with(true);
+
+		$this->userManager
+			->method('get')
+			->with('user')
+			->willReturn($user);
+
+		$this->consoleInput
+			->method('getArgument')
+			->with('uid')
+			->willReturn('user');
+
+		$this->consoleOutput->expects($this->once())
+			->method('writeln')
+			->with($this->stringContains('The specified user is enabled'));
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testInvalidUser() {
+		$this->userManager->expects($this->once())
+			->method('get')
+			->with('user')
+			->willReturn(null);
+
+		$this->consoleInput
+			->method('getArgument')
+			->with('uid')
+			->willReturn('user');
+
+		$this->consoleOutput->expects($this->once())
+			->method('writeln')
+			->with($this->stringContains('User does not exist'));
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}