diff --git a/tko/models.py b/tko/models.py
index eac08d9..d8be245 100644
--- a/tko/models.py
+++ b/tko/models.py
@@ -335,9 +335,8 @@
     #
     # TODO(ayatane): We should pass hostinfo path explicitly.
     subdir = 'host_info_store'
-    hostinfo_dir = os.path.join(job_dir, subdir)
-    hostinfo_path = os.path.join(hostinfo_dir, os.listdir(hostinfo_dir)[0],
-                                 hostname + '.store')
+    subdir = os.path.join(subdir, os.listdir(subdir)[0])
+    hostinfo_path = os.path.join(job_dir, subdir, hostname + '.store')
     store = file_store.FileStore(hostinfo_path)
     hostinfo = store.get()
     # TODO(ayatane): Investigate if urllib.quote is better.