diff --git a/cdist/test/fixtures/remote b/cdist/test/fixtures/remote
new file mode 120000
index 00000000..c5db6358
--- /dev/null
+++ b/cdist/test/fixtures/remote
@@ -0,0 +1 @@
+../../../other/examples/remote/local
\ No newline at end of file
diff --git a/docs/changelog b/docs/changelog
index db6dbe59..2cdf6cbf 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -5,6 +5,9 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius
 
 
+2.1.0pre6:
+	* New Example: Turn remote calls into local calls (used for unittesting)
+
 2.1.0pre5: 2012-11-01
 	* Core: First round of tests updated to work with multiple configuration directories
 
diff --git a/other/examples/remote/local/README b/other/examples/remote/local/README
new file mode 100644
index 00000000..cfd350f9
--- /dev/null
+++ b/other/examples/remote/local/README
@@ -0,0 +1,3 @@
+This effectively turns remote calling into local calling.
+
+Probably most useful for the unittesting.
diff --git a/cdist/test/fixtures/remote/copy b/other/examples/remote/local/copy
similarity index 100%
rename from cdist/test/fixtures/remote/copy
rename to other/examples/remote/local/copy
diff --git a/cdist/test/fixtures/remote/exec b/other/examples/remote/local/exec
similarity index 100%
rename from cdist/test/fixtures/remote/exec
rename to other/examples/remote/local/exec