diff --git a/tools/ci/python_packages/ttfw_idf/IDFApp.py b/tools/ci/python_packages/ttfw_idf/IDFApp.py
index 209cfcb076..70677437aa 100644
--- a/tools/ci/python_packages/ttfw_idf/IDFApp.py
+++ b/tools/ci/python_packages/ttfw_idf/IDFApp.py
@@ -308,6 +308,7 @@ class IDFApp(App.BaseApp):
                         _size = int(_size[:-1]) * 1024 * 1024
                     else:
                         _size = int(_size)
+                    _offset = int(_offset, 0)
                 except ValueError:
                     continue
                 partition_table[_name] = {
diff --git a/tools/ci/python_packages/ttfw_idf/IDFDUT.py b/tools/ci/python_packages/ttfw_idf/IDFDUT.py
index 3a337b67c1..99f7254acb 100644
--- a/tools/ci/python_packages/ttfw_idf/IDFDUT.py
+++ b/tools/ci/python_packages/ttfw_idf/IDFDUT.py
@@ -226,7 +226,9 @@ class IDFDUT(DUT.SerialDUT):
                 nvs_file = tempfile.TemporaryFile()
                 nvs_file.write(b'\xff' * size)
                 nvs_file.seek(0)
-                flash_files.append((int(address, 0), nvs_file))
+                if not isinstance(address, int):
+                    address = int(address, 0)
+                flash_files.append((address, nvs_file))
 
             # fake flasher args object, this is a hack until
             # esptool Python API is improved