diff --git a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java
index 61ad4e8..5d60870 100644
--- a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java
+++ b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/installer/impl/SfcFlowRuleInstallerImplTest.java
@@ -58,13 +58,13 @@
 import org.onosproject.net.flow.criteria.PortCriterion;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.Instructions.OutputInstruction;
+import org.onosproject.net.flowobjective.FlowObjectiveServiceAdapter;
 import org.onosproject.net.flowobjective.FlowObjectiveService;
 import org.onosproject.net.flowobjective.ForwardingObjective;
 import org.onosproject.net.host.HostService;
 import org.onosproject.net.host.HostServiceAdapter;
 import org.onosproject.net.provider.ProviderId;
 import org.onosproject.sfc.util.FlowClassifierAdapter;
-import org.onosproject.sfc.util.FlowObjectiveAdapter;
 import org.onosproject.sfc.util.MockDriverHandler;
 import org.onosproject.sfc.util.PortPairAdapter;
 import org.onosproject.sfc.util.PortPairGroupAdapter;
@@ -113,7 +113,7 @@
 
 public class SfcFlowRuleInstallerImplTest {
 
-    FlowObjectiveService flowObjectiveService = new FlowObjectiveAdapter();
+    FlowObjectiveService flowObjectiveService = new FlowObjectiveServiceAdapter();
     DeviceService deviceService = new DeviceServiceAdapter(createPortList());
 
     HostService hostService = new HostServiceAdapter();
@@ -401,7 +401,7 @@
 
         flowRuleInstaller.installLoadBalancedFlowRules(portChain, fiveTuple, nshSpiId);
 
-        ForwardingObjective forObj = ((FlowObjectiveAdapter) flowObjectiveService).forwardingObjective();
+        ForwardingObjective forObj = ((FlowObjectiveServiceAdapter) flowObjectiveService).forwardingObjective();
 
         // Check for Selector
         assertThat(forObj.selector().getCriterion(Criterion.Type.IN_PORT), instanceOf(PortCriterion.class));
diff --git a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/FlowObjectiveAdapter.java b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/FlowObjectiveAdapter.java
deleted file mode 100644
index cecc381..0000000
--- a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/FlowObjectiveAdapter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2016-present 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.sfc.util;
-
-import java.util.List;
-
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flowobjective.FilteringObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.NextObjective;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Testing version of implementation on FlowObjectiveService.
- */
-public class FlowObjectiveAdapter implements FlowObjectiveService {
-
-    private ForwardingObjective forwardingObjective;
-    @Override
-    public void filter(DeviceId deviceId, FilteringObjective filteringObjective) {
-
-    }
-
-    @Override
-    public void forward(DeviceId deviceId, ForwardingObjective forwardingObjective) {
-        this.forwardingObjective = forwardingObjective;
-    }
-
-    @Override
-    public void next(DeviceId deviceId, NextObjective nextObjective) {
-
-    }
-
-    @Override
-    public int allocateNextId() {
-        return 0;
-    }
-
-    @Override
-    public void initPolicy(String policy) {
-
-    }
-
-    public ForwardingObjective forwardingObjective() {
-        return forwardingObjective;
-    }
-
-    @Override
-    public List<String> getNextMappings() {
-        return ImmutableList.of();
-    }
-
-    @Override
-    public List<String> getPendingNexts() {
-        return ImmutableList.of();
-    }
-}
