diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/operation/PushNotificationTests.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/operation/PushNotificationTests.java
deleted file mode 100644
index 2170f1863c6..00000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/operation/PushNotificationTests.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-*  Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*  WSO2 Inc. licenses this file to you 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.wso2.carbon.device.mgt.core.operation;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
-import org.wso2.carbon.device.mgt.common.operation.mgt.ActivityStatus;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
-import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
-import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
-import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
-import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
-import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
-import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;
-import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImpl;
-import org.wso2.carbon.registry.core.config.RegistryContext;
-import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.internal.RegistryDataHolder;
-import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
-import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.user.core.service.RealmService;
-import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class PushNotificationTests {
-    private static final String DEVICE_TYPE = "OP_TEST_TYPE";
-    private static final String DEVICE_ID_PREFIX = "OP-TEST-DEVICE-ID-";
-    private static final String COMMAND_OPERATON_CODE = "COMMAND-TEST";
-    private static final String POLICY_OPERATION_CODE = "POLICY-TEST";
-    private static final String CONFIG_OPERATION_CODE = "CONFIG-TEST";
-    private static final String PROFILE_OPERATION_CODE = "PROFILE-TEST";
-    private static final String DATE_FORMAT_NOW = "yyyy-MM-dd HH:mm:ss";
-    private static final int NO_OF_DEVICES = 5;
-    private static final String ADMIN_USER = "admin";
-    private static final String NON_ADMIN_USER = "test";
-
-    private List<DeviceIdentifier> deviceIds = new ArrayList<>();
-    private OperationManager operationMgtService;
-    private Activity commandActivity;
-
-    @BeforeClass
-    public void init() throws Exception {
-        DeviceConfigurationManager.getInstance().initConfig();
-        for (int i = 0; i < NO_OF_DEVICES; i++) {
-            deviceIds.add(new DeviceIdentifier(DEVICE_ID_PREFIX + i, DEVICE_TYPE));
-        }
-        List<Device> devices = TestDataHolder.generateDummyDeviceData(this.deviceIds);
-        DeviceManagementProviderService deviceMgtService = new DeviceManagementProviderServiceImpl();
-        deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
-                MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
-        for (Device device : devices) {
-            deviceMgtService.enrollDevice(device);
-        }
-        List<Device> returnedDevices = deviceMgtService.getAllDevices(DEVICE_TYPE);
-        for (Device device : returnedDevices) {
-            if (!device.getDeviceIdentifier().startsWith(DEVICE_ID_PREFIX)) {
-                throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
-            }
-        }
-        NotificationStrategy notificationStrategy = new TestNotificationStrategy();
-        this.operationMgtService = new OperationManagerImpl(DEVICE_TYPE, notificationStrategy);
-    }
-
-//    @Test
-//    public void addPushNotificationOperation() throws DeviceManagementException, OperationManagementException, InvalidDeviceException {
-//        this.commandActivity = this.operationMgtService.addOperation(getOperation(new CommandOperation(), Operation.Type.COMMAND, COMMAND_OPERATON_CODE),
-//                this.deviceIds);
-//        validateOperationResponse(this.commandActivity, ActivityStatus.Status.PENDING);
-//    }
-}