diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 79a6c998a..2942bf9f6 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="3.0.7" android:versionCode="146"
+          android:versionName="3.1.0" android:versionCode="146"
           android:installLocation="internalOnly">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
diff --git a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java b/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
index d7033bea4..a4c2cc0a3 100644
--- a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
+++ b/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
@@ -11,6 +11,7 @@ import com.todoroo.astrid.utility.Preferences;
 public class ReminderServiceTests extends DatabaseTestCase {
 
     ReminderService service;
+    AlarmScheduler original;
 
     @Autowired
     TaskDao taskDao;
@@ -19,9 +20,16 @@ public class ReminderServiceTests extends DatabaseTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         service = ReminderService.getInstance();
+        original = service.getScheduler();
         Preferences.setPreferenceDefaults();
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        service.setScheduler(original);
+    }
+
     /** tests with no alarms */
     public void testNoReminders() {
         service.setScheduler(new NoAlarmExpected());