diff --git a/tests/integration/api-restart.sh b/tests/integration/api-restart.sh
new file mode 100755
index 000000000..fd6f033cb
--- /dev/null
+++ b/tests/integration/api-restart.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# Integration test for remote API
+#
+# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+# @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+# @license GNU General Public License (version 3)
+#
+# VILLASnode
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##################################################################################
+
+set -e
+
+LOCAL_CONF=$(mktemp)
+FETCHED_CONF=$(mktemp)
+
+cat <<EOF > ${LOCAL_CONF}
+{
+	"nodes" : {
+		"node1" : {
+			"type"   : "socket",
+			"local"  : "*:12000",
+			"remote" : "127.0.0.1:12001"
+		}
+	},
+	"paths" : [
+		{
+			"in" : "node1", "out" : "node1",
+			"hooks" : [ { "type" : "print" } ]
+		}
+	]
+}
+EOF
+
+# Start without a configuration
+villas-node &
+
+# Wait for node to complete init
+sleep 0.2
+
+# Restart with configuration
+curl -sX POST --data '{ "action" : "restart", "request" : { "config": "'${LOCAL_CONF}'" }, "id" : "5a786626-fbc6-4c04-98c2-48027e68c2fa" }' http://localhost/api/v1
+
+# Wait for node to complete init
+sleep 0.2
+
+# Fetch config via API
+curl -sX POST --data '{ "action" : "config", "id" : "5a786626-fbc6-4c04-98c2-48027e68c2fa" }' http://localhost/api/v1 > ${FETCHED_CONF}
+
+# Shutdown VILLASnode
+kill %%
+
+
+# Compare local config with the fetched one
+diff -u <(jq -S .response < ${FETCHED_CONF}) <(jq -S . < ${LOCAL_CONF})
+RC=$?
+
+rm -f ${LOCAL_CONF} ${FETCHED_CONF}
+
+exit $RC
\ No newline at end of file
diff --git a/tests/integration/api-shutdown.sh b/tests/integration/api-shutdown.sh
new file mode 100755
index 000000000..8e91b96ae
--- /dev/null
+++ b/tests/integration/api-shutdown.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# Integration test for remote API
+#
+# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
+# @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
+# @license GNU General Public License (version 3)
+#
+# VILLASnode
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##################################################################################
+
+set -e
+
+# Start without a configuration
+timeout -s SIGKILL 3 villas-node &
+
+# Wait for node to complete init
+sleep 1
+
+# Restart with configuration
+curl -sX POST --data '{ "action" : "shutdown", "id" : "5a786626-fbc6-4c04-98c2-48027e68c2fa" }' http://localhost/api/v1
+
+# Wait returns the return code of villas-node
+# which will be 0 (success) in case of normal shutdown
+# or <>0 (fail) in case the 3 second timeout was reached
+wait $!
\ No newline at end of file