diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index 5ec81dc3fc..586e99a3cb 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -171,7 +171,7 @@ class JobList implements IJobList {
 	 * @return int
 	 */
 	public function getLastJob() {
-		$this->config->getAppValue('backgroundjob', 'lastjob', 0);
+		return $this->config->getAppValue('backgroundjob', 'lastjob', 0);
 	}
 
 	/**
diff --git a/tests/lib/backgroundjob/job.php b/tests/lib/backgroundjob/job.php
index 7d66fa772d..10a8f46462 100644
--- a/tests/lib/backgroundjob/job.php
+++ b/tests/lib/backgroundjob/job.php
@@ -8,31 +8,6 @@
 
 namespace Test\BackgroundJob;
 
-
-class TestJob extends \OC\BackgroundJob\Job {
-	private $testCase;
-
-	/**
-	 * @var callable $callback
-	 */
-	private $callback;
-
-	/**
-	 * @param Job $testCase
-	 * @param callable $callback
-	 */
-	public function __construct($testCase, $callback) {
-		$this->testCase = $testCase;
-		$this->callback = $callback;
-	}
-
-	public function run($argument) {
-		$this->testCase->markRun();
-		$callback = $this->callback;
-		$callback($argument);
-	}
-}
-
 class Job extends \PHPUnit_Framework_TestCase {
 	private $run = false;
 
diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php
new file mode 100644
index 0000000000..c3318f80cb
--- /dev/null
+++ b/tests/lib/backgroundjob/joblist.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+class JobList extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @var \OC\BackgroundJob\JobList
+	 */
+	protected $instance;
+
+	/**
+	 * @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject $config
+	 */
+	protected $config;
+
+	public function setUp() {
+		$conn = \OC::$server->getDatabaseConnection();
+		$this->config = $this->getMock('\OCP\IConfig');
+		$this->instance = new \OC\BackgroundJob\JobList($conn, $this->config);
+	}
+
+	public function argumentProvider() {
+		return array(
+			array(null),
+			array(false),
+			array('foobar'),
+			array(12),
+			array(array(
+				'asd' => 5,
+				'foo' => 'bar'
+			))
+		);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testAddRemove($argument) {
+		$existingJobs = $this->instance->getAll();
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$jobs = $this->instance->getAll();
+
+		$this->assertCount(count($existingJobs) + 1, $jobs);
+		$addedJob = $jobs[count($jobs) - 1];
+		$this->assertInstanceOf('\Test\BackgroundJob\TestJob', $addedJob);
+		$this->assertEquals($argument, $addedJob->getArgument());
+
+		$this->instance->remove($job, $argument);
+
+		$jobs = $this->instance->getAll();
+		$this->assertEquals($existingJobs, $jobs);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testRemoveDifferentArgument($argument) {
+		$existingJobs = $this->instance->getAll();
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$jobs = $this->instance->getAll();
+		$this->instance->remove($job, 10);
+		$jobs2 = $this->instance->getAll();
+
+		$this->assertEquals($jobs, $jobs2);
+
+		$this->instance->remove($job, $argument);
+
+		$jobs = $this->instance->getAll();
+		$this->assertEquals($existingJobs, $jobs);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testHas($argument) {
+		$job = new TestJob();
+		$this->assertFalse($this->instance->has($job, $argument));
+		$this->instance->add($job, $argument);
+
+		$this->assertTrue($this->instance->has($job, $argument));
+
+		$this->instance->remove($job, $argument);
+
+		$this->assertFalse($this->instance->has($job, $argument));
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testHasDifferentArgument($argument) {
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$this->assertFalse($this->instance->has($job, 10));
+
+		$this->instance->remove($job, $argument);
+	}
+
+	public function testGetLastJob() {
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('backgroundjob', 'lastjob', 0)
+			->will($this->returnValue(15));
+
+		$this->assertEquals(15, $this->instance->getLastJob());
+	}
+
+	public function testGetNext() {
+		$job = new TestJob();
+		$this->instance->add($job, 1);
+		$this->instance->add($job, 2);
+
+		$jobs = $this->instance->getAll();
+
+		$savedJob1 = $jobs[count($jobs) - 2];
+		$savedJob2 = $jobs[count($jobs) - 1];
+
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('backgroundjob', 'lastjob', 0)
+			->will($this->returnValue($savedJob1->getId()));
+
+		$nextJob = $this->instance->getNext();
+
+		$this->assertEquals($savedJob2, $nextJob);
+
+		$this->instance->remove($job, 1);
+		$this->instance->remove($job, 2);
+	}
+
+	public function testGetNextWrapAround() {
+		$job = new TestJob();
+		$this->instance->add($job, 1);
+		$this->instance->add($job, 2);
+
+		$jobs = $this->instance->getAll();
+
+		$savedJob2 = $jobs[count($jobs) - 1];
+
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('backgroundjob', 'lastjob', 0)
+			->will($this->returnValue($savedJob2->getId()));
+
+		$nextJob = $this->instance->getNext();
+
+		$this->assertEquals($jobs[0], $nextJob);
+
+		$this->instance->remove($job, 1);
+		$this->instance->remove($job, 2);
+	}
+
+	/**
+	 * @dataProvider argumentProvider
+	 * @param $argument
+	 */
+	public function testGetById($argument) {
+		$job = new TestJob();
+		$this->instance->add($job, $argument);
+
+		$jobs = $this->instance->getAll();
+
+		$addedJob = $jobs[count($jobs) - 1];
+
+		$this->assertEquals($addedJob, $this->instance->getById($addedJob->getId()));
+
+		$this->instance->remove($job, $argument);
+	}
+
+	public function testSetLastRun() {
+		$job = new TestJob();
+		$this->instance->add($job);
+
+		$jobs = $this->instance->getAll();
+
+		$addedJob = $jobs[count($jobs) - 1];
+
+		$timeStart = time();
+		$this->instance->setLastRun($addedJob);
+		$timeEnd = time();
+
+		$addedJob = $this->instance->getById($addedJob->getId());
+
+		$this->assertGreaterThanOrEqual($timeStart, $addedJob->getLastRun());
+		$this->assertLessThanOrEqual($timeEnd, $addedJob->getLastRun());
+
+		$this->instance->remove($job);
+	}
+}
diff --git a/tests/lib/backgroundjob/testjob.php b/tests/lib/backgroundjob/testjob.php
new file mode 100644
index 0000000000..23fc4268d1
--- /dev/null
+++ b/tests/lib/backgroundjob/testjob.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\BackgroundJob;
+
+
+class TestJob extends \OC\BackgroundJob\Job {
+	private $testCase;
+
+	/**
+	 * @var callable $callback
+	 */
+	private $callback;
+
+	/**
+	 * @param Job $testCase
+	 * @param callable $callback
+	 */
+	public function __construct($testCase = null, $callback = null) {
+		$this->testCase = $testCase;
+		$this->callback = $callback;
+	}
+
+	public function run($argument) {
+		$this->testCase->markRun();
+		$callback = $this->callback;
+		$callback($argument);
+	}
+}