diff --git a/os/run/failsafe.run b/os/run/failsafe.run
index ebb3ebce0..b9c5f93cb 100644
--- a/os/run/failsafe.run
+++ b/os/run/failsafe.run
@@ -4,6 +4,11 @@
 # \date   2012-11-01
 #
 
+if {[have_spec pistachio]} {
+	puts "Pistachio is unsupported (see https://github.com/genodelabs/genode/issues/16)"
+	exit 0
+}
+
 #
 # Build
 #
diff --git a/tool/autopilot.list b/tool/autopilot.list
index 669857e92..3af6df84d 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -16,3 +16,4 @@ lx_hybrid_exception
 lx_hybrid_pthread_ipc
 moon
 thread_join
+failsafe