diff --git a/wa/commands/revent.py b/wa/commands/revent.py
index 44639794..4e26b7b7 100644
--- a/wa/commands/revent.py
+++ b/wa/commands/revent.py
@@ -178,7 +178,7 @@ class RecordCommand(Command):
 
         self.logger.info('Deploying {}'.format(args.workload))
         workload = pluginloader.get_workload(args.workload, self.target)
-        workload.apk.init_resources(context.resolver)
+        workload.apk.initialize(context)
         workload.apk.setup(context)
         sleep(workload.loading_time)
 
diff --git a/wa/framework/workload.py b/wa/framework/workload.py
index d1dbfa47..5089479e 100644
--- a/wa/framework/workload.py
+++ b/wa/framework/workload.py
@@ -388,8 +388,9 @@ class ReventGUI(object):
 
     def setup(self):
         self._check_revent_files()
-        self.revent_recorder.replay(self.on_target_setup_revent,
-                                    timeout=self.setup_timeout)
+        if self.revent_setup_file:
+            self.revent_recorder.replay(self.on_target_setup_revent,
+                                        timeout=self.setup_timeout)
 
     def run(self):
         msg = 'Replaying {}'