diff --git a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh
index 4ac9112c0..9a11ab485 100644
--- a/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh
+++ b/features/iot-plugins-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh
@@ -107,14 +107,15 @@ if [ "$mode" = "N" ]; then
      sudo python setup.py install
      cd ..
      # -----------------------------------------------------
-     # Install Paho-MQTT-Library for MQTT Communication
-     git clone https://github.com/eclipse/paho.mqtt.python.git
-     cd ./paho.mqtt.python
-     sudo python setup.py install
-     cd ..
-     # -----------------------------------------------------
 fi
 
+# Install Paho-MQTT-Library for MQTT Communication
+git clone https://github.com/eclipse/paho.mqtt.python.git
+cd ./paho.mqtt.python
+sudo python setup.py install
+cd ..
+# -----------------------------------------------------
+
 chmod +x ./src/RaspberryAgent.py
 sudo python ./src/RaspberryAgent.py -i $input -m $mode