diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
index ac4b44b..3951f0f 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
@@ -47,6 +47,8 @@
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.resource.Bandwidth;
 import org.onosproject.net.resource.BandwidthResourceRequest;
+import org.onosproject.net.resource.Lambda;
+import org.onosproject.net.resource.LambdaResourceAllocation;
 import org.onosproject.net.resource.LambdaResourceRequest;
 import org.onosproject.net.resource.LinkResourceAllocations;
 import org.onosproject.net.resource.LinkResourceListener;
@@ -155,7 +157,9 @@
     public static class MockLinkResourceAllocations implements LinkResourceAllocations {
         @Override
         public Set<ResourceAllocation> getResourceAllocation(Link link) {
-            return ImmutableSet.of(new MplsLabelResourceAllocation(MplsLabel.valueOf(10)));
+            return ImmutableSet.of(
+                    new LambdaResourceAllocation(Lambda.valueOf(77)),
+                    new MplsLabelResourceAllocation(MplsLabel.valueOf(10)));
         }
 
         @Override
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/installer/OpticalPathIntentInstallerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/OpticalPathIntentInstallerTest.java
new file mode 100644
index 0000000..198341f
--- /dev/null
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/installer/OpticalPathIntentInstallerTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2015 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.net.intent.impl.installer;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.Link;
+import org.onosproject.net.flow.FlowRuleOperation;
+import org.onosproject.net.intent.IntentTestsMocks;
+import org.onosproject.net.intent.OpticalPathIntent;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.onosproject.net.Link.Type.DIRECT;
+import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.PID;
+
+public class OpticalPathIntentInstallerTest extends IntentInstallerTest {
+
+    OpticalPathIntentInstaller installer;
+
+    private final List<Link> links = Arrays.asList(
+            new DefaultLink(PID, d1p1, d2p0, DIRECT),
+            new DefaultLink(PID, d2p1, d3p1, DIRECT)
+    );
+    private final int hops = links.size() + 1;
+    private OpticalPathIntent intent;
+
+    /**
+     * Configures objects used in all the test cases.
+     */
+    @Before
+    public void localSetUp() {
+        installer = new OpticalPathIntentInstaller();
+        installer.coreService = testCoreService;
+        installer.intentManager =
+                new IntentInstallerTest.MockIntentManager(OpticalPathIntent.class);
+        installer.resourceService = new IntentTestsMocks.MockResourceService();
+
+        intent = new OpticalPathIntent(APP_ID,
+                d1p1,
+                d3p1,
+                new DefaultPath(PID, links, hops));
+    }
+
+    /**
+     * Tests activation and deactivation of the installer.
+     */
+    @Test
+    public void activateDeactivate() {
+        installer.activate();
+        installer.deactivate();
+    }
+
+    /**
+     * Tests installation operation of the optical path intent installer.
+     */
+    @Test
+    public void install() {
+        installer.activate();
+
+        List<Collection<FlowRuleOperation>> operations =
+                installer.install(intent);
+        assertThat(operations, notNullValue());
+        assertThat(operations, hasSize(1));
+
+        Collection<FlowRuleOperation> flowRuleOpsCollection = operations.get(0);
+        assertThat(flowRuleOpsCollection, hasSize(hops));
+        FlowRuleOperation[] flowRuleOps =
+                flowRuleOpsCollection.toArray(new FlowRuleOperation[hops]);
+
+        FlowRuleOperation op0 = flowRuleOps[0];
+        checkFlowOperation(op0, FlowRuleOperation.Type.ADD, d1p1.deviceId());
+
+        FlowRuleOperation op1 = flowRuleOps[1];
+        checkFlowOperation(op1, FlowRuleOperation.Type.ADD, d2p1.deviceId());
+
+        FlowRuleOperation op2 = flowRuleOps[2];
+        checkFlowOperation(op2, FlowRuleOperation.Type.ADD, d3p1.deviceId());
+
+        installer.deactivate();
+    }
+
+    /**
+     * Checks the uninstall operation of the optical path intent installer.
+     */
+    @Test
+    public void uninstall() {
+        installer.activate();
+
+        List<Collection<FlowRuleOperation>> operations =
+                installer.uninstall(intent);
+        assertThat(operations, notNullValue());
+        assertThat(operations, hasSize(1));
+
+        Collection<FlowRuleOperation> flowRuleOpsCollection = operations.get(0);
+        assertThat(flowRuleOpsCollection, hasSize(hops));
+        FlowRuleOperation[] flowRuleOps =
+                flowRuleOpsCollection.toArray(new FlowRuleOperation[hops]);
+
+        FlowRuleOperation op0 = flowRuleOps[0];
+        checkFlowOperation(op0, FlowRuleOperation.Type.REMOVE, d1p1.deviceId());
+
+        FlowRuleOperation op1 = flowRuleOps[1];
+        checkFlowOperation(op1, FlowRuleOperation.Type.REMOVE, d2p1.deviceId());
+
+        FlowRuleOperation op2 = flowRuleOps[2];
+        checkFlowOperation(op2, FlowRuleOperation.Type.REMOVE, d3p1.deviceId());
+
+        installer.deactivate();
+    }
+
+}
