diff --git a/wlauto/workloads/dhrystone/__init__.py b/wlauto/workloads/dhrystone/__init__.py
index 5ead67c0..66327fff 100644
--- a/wlauto/workloads/dhrystone/__init__.py
+++ b/wlauto/workloads/dhrystone/__init__.py
@@ -18,7 +18,7 @@
 import os
 import re
 
-from wlauto import Workload, Parameter
+from wlauto import Workload, Parameter, Executable
 from wlauto.exceptions import ConfigError
 
 
@@ -67,7 +67,7 @@ class Dhrystone(Workload):
     ]
 
     def setup(self, context):
-        host_exe = os.path.join(this_dir, 'dhrystone')
+        host_exe = context.resolver.get(Executable(self, self.device.abi, 'dhrystone'))
         self.device_exe = self.device.install(host_exe)
         execution_mode = '-l {}'.format(self.mloops) if self.mloops else '-r {}'.format(self.duration)
         if self.taskset_mask:
@@ -127,4 +127,3 @@ class Dhrystone(Workload):
             raise ConfigError('mloops and duration cannot be both specified at the same time for dhrystone.')
         if not self.mloops and not self.duration:  # pylint: disable=E0203
             self.mloops = self.default_mloops
-
diff --git a/wlauto/workloads/dhrystone/bin/arm64/dhrystone b/wlauto/workloads/dhrystone/bin/arm64/dhrystone
new file mode 100755
index 00000000..3ae164ca
Binary files /dev/null and b/wlauto/workloads/dhrystone/bin/arm64/dhrystone differ
diff --git a/wlauto/workloads/dhrystone/dhrystone b/wlauto/workloads/dhrystone/bin/armeabi/dhrystone
similarity index 100%
rename from wlauto/workloads/dhrystone/dhrystone
rename to wlauto/workloads/dhrystone/bin/armeabi/dhrystone