diff --git a/baas2-restoretest-prod-1.sunet.se/overlay/opt/restoretest/validate-backup-files b/baas2-restoretest-prod-1.sunet.se/overlay/opt/restoretest/validate-backup-files
new file mode 100755
index 0000000..e69de29
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index c155742..d7dbaa9 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -33,6 +33,7 @@ baas2-backuptest-prod-1.sunet.se:
       - '/opt/backuptest'
 
 baas2-restoretest-prod-1.sunet.se:
+  net::restore_test:
   sunet::baas2:
     nodename: B0DA416B08FC
     backup_dirs:
diff --git a/global/overlay/etc/puppet/modules/net/manifests/baas2-restoretest.pp b/global/overlay/etc/puppet/modules/net/manifests/baas2-restoretest.pp
new file mode 100644
index 0000000..97a3279
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/net/manifests/baas2-restoretest.pp
@@ -0,0 +1,13 @@
+# This puppet manifest is used to test backup and restore in an automated fashion
+# This tests the backup and restores when manged by sunet::baas2 from puppet-sunet
+# Jira-ref: SUNETOPS-1997
+class net::baas2_restoretest() {
+
+  file { '/opt/restore-target':
+    ensure => directory,
+    mode   => '0755',
+    owner  => 'root',
+    group  => 'root',
+  }
+
+}