diff --git a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
index 2571b88dc4..0f98977747 100644
--- a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
+++ b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
@@ -307,7 +307,7 @@ public class NetconfDeviceProviderTest {
     }
 
     private void prepareMocks(int count) {
-        for(int i = 1; i <= count; i++) {
+        for (int i = 1; i <= count; i++) {
             deviceDescription.portDescriptions.add(new DefaultPortDescription(PortNumber.portNumber(i), true));
         }
     }
@@ -332,7 +332,7 @@ public class NetconfDeviceProviderTest {
 
         @Override
         public void disconnectDevice(DeviceId deviceId, boolean remove) {
-            netconfDeviceListeners.forEach( l -> l.deviceRemoved(deviceId));
+            netconfDeviceListeners.forEach(l -> l.deviceRemoved(deviceId));
         }
     }
 
diff --git a/providers/ovsdb/device/src/test/java/org/onosproject/ovsdb/providers/device/OvsdbDeviceProviderTest.java b/providers/ovsdb/device/src/test/java/org/onosproject/ovsdb/providers/device/OvsdbDeviceProviderTest.java
index 9538f9b59c..c7dbe7e334 100644
--- a/providers/ovsdb/device/src/test/java/org/onosproject/ovsdb/providers/device/OvsdbDeviceProviderTest.java
+++ b/providers/ovsdb/device/src/test/java/org/onosproject/ovsdb/providers/device/OvsdbDeviceProviderTest.java
@@ -56,12 +56,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import static org.junit.Assert.assertEquals;