diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-restore.expect b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-restore.expect
new file mode 100644
index 0000000..0ac9f87
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-restore.expect
@@ -0,0 +1,7 @@
+#!/usr/bin/expect
+set nodename [lindex $argv 0]
+set enc_password [lindex $argv 1]
+
+spawn dsmc restore /opt/backup-test/ /opt/restore-target/ -asnodename=$nodename -subdir=yes
+expect -exact "Action [1,2,3,A] : "
+send -- "$enc_password\r"
\ No newline at end of file
diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files
index e69de29..d3d705f 100755
--- a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files
+++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+nodename=$1
+
+set -eu
+
+restoretarget=/opt/restore-target
+rm /opt/restore-target/*
+
+enc_password=$(eyaml decrypt -f /etc/hiera/data/local.eyaml --pkcs7-private-key=/etc/hiera/eyaml/private_key.pkcs7.pem --pkcs7-public-key=/etc/hiera/eyaml/public_certkey.pkcs7.pem | awk '/^baas2_restoretest_encryption_password: /{print $2}')
+
+/opt/baas2/run-restore.expect $nodename $enc_password
diff --git a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp
index 78fd6b5..26e6b99 100644
--- a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp
+++ b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp
@@ -20,6 +20,20 @@ class net::baas2_restoretest(
       owner  => 'root',
       group  => 'root',
     }
+
+    file { '/opt/baas2/run-restore.expect':
+      ensure  => 'file',
+      mode    => '0755',
+      owner   => 'root',
+      content => file('net/baas2_restoretest/run-restore.expect')
+    }
+
+    file { '/opt/baas2/validate-backup-files':
+      ensure  => 'file',
+      mode    => '0755',
+      owner   => 'root',
+      content => file('net/baas2_restoretest/validate-backup-files')
+    }
   }
 
   if $node_type == 'backupnode' {