diff --git a/src/ns_server_nodes_sup.erl b/src/ns_server_nodes_sup.erl
index 7fa00e7882..91c529edbc 100644
--- a/src/ns_server_nodes_sup.erl
+++ b/src/ns_server_nodes_sup.erl
@@ -21,7 +21,7 @@
 
 -include("ns_common.hrl").
 
--behaviour(supervisor).
+-behaviour(supervisor2).
 
 %% API
 -export([start_link/0, start_couchdb_node/0]).
diff --git a/src/ns_server_sup.erl b/src/ns_server_sup.erl
index 8b5506a6f3..8b8070353e 100644
--- a/src/ns_server_sup.erl
+++ b/src/ns_server_sup.erl
@@ -15,7 +15,7 @@
 %%
 -module(ns_server_sup).
 
--behaviour(supervisor).
+-behaviour(supervisor2).
 
 -include("ns_common.hrl").