diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
index a9505b0dc9..838d9bddc3 100644
--- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
+++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/LoWPANNDInterface.h
@@ -34,9 +34,9 @@ public:
     LoWPANNDInterface(NanostackRfPhy *phy) : MeshInterfaceNanostack(phy) { }
 
     nsapi_error_t initialize(NanostackRfPhy *phy);
-    int connect();
-    int disconnect();
-    bool getOwnIpAddress(char *address, int8_t len);
+    virtual int connect();
+    virtual int disconnect();
+    virtual bool getOwnIpAddress(char *address, int8_t len);
     bool getRouterIpAddress(char *address, int8_t len);
 private:
     mesh_error_t init();
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
index 86108f542b..be8397d290 100644
--- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
+++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h
@@ -32,7 +32,7 @@ public:
      *
      *  @return     0 on success, negative on failure
      */
-    virtual nsapi_error_t initialize(NanostackPhy *phy);
+    nsapi_error_t initialize(NanostackPhy *phy);
 
     /** Start the interface
      *
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
index 1d794403bf..45235e103a 100644
--- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
+++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h
@@ -27,9 +27,9 @@ public:
     NanostackEthernetInterface(NanostackEthernetPhy *phy) : MeshInterfaceNanostack(phy) { }
 
     nsapi_error_t initialize(NanostackEthernetPhy *phy);
-    int connect();
-    int disconnect();
-    bool getOwnIpAddress(char *address, int8_t len);
+    virtual int connect();
+    virtual int disconnect();
+    virtual bool getOwnIpAddress(char *address, int8_t len);
     bool getRouterIpAddress(char *address, int8_t len);
 };
 
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
index b565026c65..5aeba87e7f 100644
--- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
+++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/mbed-mesh-api/ThreadInterface.h
@@ -34,8 +34,8 @@ public:
     ThreadInterface(NanostackRfPhy *phy) : MeshInterfaceNanostack(phy) { }
 
     nsapi_error_t initialize(NanostackRfPhy *phy);
-    int connect();
-    int disconnect();
+    virtual int connect();
+    virtual int disconnect();
 private:
     /*
      * \brief Initialization of the interface.
@@ -69,7 +69,7 @@ private:
      * \param len is the length of the address buffer, must be at least 40 bytes
      * \return true if address is read successfully, false otherwise
      */
-    bool getOwnIpAddress(char *address, int8_t len);
+    virtual bool getOwnIpAddress(char *address, int8_t len);
 };
 
-#endif // THREADINTERFACE_H
\ No newline at end of file
+#endif // THREADINTERFACE_H
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp
index f49e30c6a3..9dfc686b62 100644
--- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp
+++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/LoWPANNDInterface.cpp
@@ -124,4 +124,4 @@ bool LoWPANNDInterface::getRouterIpAddress(char *address, int8_t len)
         return true;
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h
index 5852cc4fed..0876c7dd2d 100644
--- a/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h
+++ b/features/nanostack/FEATURE_NANOSTACK/mbed-mesh-api/source/include/enet_tasklet.h
@@ -32,4 +32,4 @@ int8_t enet_tasklet_get_ip_address(char *address, int8_t len);
 }
 #endif
 
-#endif // ENET_TASKLET_H
\ No newline at end of file
+#endif // ENET_TASKLET_H
diff --git a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
index 38b992125f..02bd7b1ace 100644
--- a/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
+++ b/features/nanostack/FEATURE_NANOSTACK/nanostack-interface/NanostackRfPhy.h
@@ -27,12 +27,12 @@ public:
      *  @return         Device driver ID or a negative error
      *                  code on failure
      */
-    int8_t phy_register() { return rf_register();}
+    virtual int8_t phy_register() { return rf_register();}
 
     /** Unregister this physical interface
      *
      */
-    void unregister() { rf_unregister(); }
+    virtual void unregister() { rf_unregister(); }
 };
 
 #endif /* NANOSTACK_RF_PHY_H_ */