diff --git a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java b/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
index 722665e..93dc04c 100644
--- a/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/DevicesResourceTest.java
@@ -206,8 +206,11 @@
         return new DeviceJsonArrayMatcher(device);
     }
 
+    /**
+     * Initializes test mocks and environment.
+     */
     @Before
-    public void setUp() {
+    public void setUpMocks() {
         mockDeviceService = createMock(DeviceService.class);
 
         expect(mockDeviceService.isAvailable(isA(DeviceId.class)))
@@ -226,13 +229,13 @@
                         .add(CodecService.class, codecService);
 
         BaseResource.setServiceDirectory(testDirectory);
-
-
     }
 
+    /**
+     * Verifies test mocks.
+     */
     @After
-    public void tearDown() throws Exception {
-        super.tearDown();
+    public void tearDownMocks() {
         verify(mockDeviceService);
     }