diff --git a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
index 58af77a..693a90f 100644
--- a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
@@ -102,7 +102,9 @@
         registry = mgr;
         mgr.store = new SimpleDeviceStore();
         mgr.eventDispatcher = new TestEventDispatcher();
-        mgr.mastershipService = new TestMastershipService();
+        TestMastershipManager mastershipManager = new TestMastershipManager();
+        mgr.mastershipService = mastershipManager;
+        mgr.termService = mastershipManager;
         mgr.clusterService = new TestClusterService();
         mgr.deviceClockProviderService = new TestClockProviderService();
         mgr.activate();
@@ -283,8 +285,8 @@
         }
     }
 
-    private static class TestMastershipService
-            extends MastershipServiceAdapter {
+    private static class TestMastershipManager
+            extends MastershipServiceAdapter implements MastershipTermService {
         @Override
         public MastershipRole getLocalRole(DeviceId deviceId) {
             return MastershipRole.MASTER;
@@ -301,14 +303,9 @@
         }
 
         @Override
-        public MastershipTermService requestTermService() {
-            return new MastershipTermService() {
-                @Override
-                public MastershipTerm getMastershipTerm(DeviceId deviceId) {
-                    // FIXME: just returning something not null
-                    return MastershipTerm.of(NID_LOCAL, 1);
-                }
-            };
+        public MastershipTerm getMastershipTerm(DeviceId deviceId) {
+            // FIXME: just returning something not null
+            return MastershipTerm.of(NID_LOCAL, 1);
         }
     }