diff --git a/core/common/src/test/java/org/onosproject/store/trivial/NoOpClockProviderService.java b/core/common/src/test/java/org/onosproject/store/trivial/NoOpClockProviderService.java
new file mode 100644
index 0000000..739d36f
--- /dev/null
+++ b/core/common/src/test/java/org/onosproject/store/trivial/NoOpClockProviderService.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.store.trivial;
+
+import java.util.Set;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.onosproject.mastership.MastershipTerm;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceClockProviderService;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Dummy implementation of {@link DeviceClockProviderService}.
+ */
+@Component(immediate = true)
+@Service
+public class NoOpClockProviderService implements DeviceClockProviderService {
+
+    private Set<DeviceId> registerdBefore = Sets.newConcurrentHashSet();
+
+    @Override
+    public void setMastershipTerm(DeviceId deviceId, MastershipTerm term) {
+        registerdBefore.add(deviceId);
+    }
+
+    @Override
+    public boolean isTimestampAvailable(DeviceId deviceId) {
+        return registerdBefore.contains(deviceId);
+    }
+}