diff --git a/vndk/tools/definition-tool/tests/test_elfdump.py b/vndk/tools/definition-tool/tests/test_elfdump.py
index 44b7935f6..b9e9626e5 100755
--- a/vndk/tools/definition-tool/tests/test_elfdump.py
+++ b/vndk/tools/definition-tool/tests/test_elfdump.py
@@ -17,7 +17,8 @@ import targets
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 VNDK_DEF_TOOL = os.path.join(SCRIPT_DIR, '..', 'vndk_definition_tool.py')
 
-expected_dir = os.path.join(SCRIPT_DIR, 'expected')
+INPUT_DIR = os.path.join(SCRIPT_DIR ,'testdata', 'test_elfdump', 'input')
+EXPECTED_DIR = os.path.join(SCRIPT_DIR, 'testdata', 'test_elfdump', 'expected')
 test_dir_base = None
 
 
@@ -48,14 +49,13 @@ class ELFDumpTest(unittest.TestCase):
     def _build_fixtures(cls, target_name):
         target = cls.targets[target_name]
 
-        cls.expected_dir = os.path.join(expected_dir, target_name)
+        cls.expected_dir = os.path.join(EXPECTED_DIR, target_name)
         cls.test_dir = os.path.join(cls.test_dir_base, target_name)
-        input_dir = os.path.join(SCRIPT_DIR, 'input')
 
         makedirs(cls.test_dir, exist_ok=True)
 
         # Compile main.o.
-        src_file = os.path.join(input_dir, 'main.c')
+        src_file = os.path.join(INPUT_DIR, 'main.c')
         obj_file = os.path.join(cls.test_dir, 'main.o')
         target.compile(obj_file, src_file, [])
 
@@ -64,7 +64,7 @@ class ELFDumpTest(unittest.TestCase):
         target.link(out_file, [obj_file], ['-ldl', '-lc', '-lstdc++'])
 
         # Compile test.o.
-        src_file = os.path.join(input_dir, 'test.c')
+        src_file = os.path.join(INPUT_DIR, 'test.c')
         obj_file = os.path.join(cls.test_dir, 'test.o')
         target.compile(obj_file, src_file, [])
 
diff --git a/vndk/tools/definition-tool/tests/expected/arm/libtest-rpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-rpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm/libtest-rpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-rpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm/libtest-rpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-rpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm/libtest-rpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-rpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm/libtest-runpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-runpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm/libtest-runpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-runpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm/libtest-runpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-runpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm/libtest-runpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest-runpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm/libtest.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm/libtest.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/libtest.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm/main.out.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/main.out.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm/main.out.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm/main.out.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm64/libtest-rpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-rpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm64/libtest-rpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-rpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm64/libtest-rpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-rpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm64/libtest-rpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-rpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm64/libtest-runpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-runpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm64/libtest-runpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-runpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm64/libtest-runpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-runpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm64/libtest-runpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest-runpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm64/libtest.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm64/libtest.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/libtest.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/arm64/main.out.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/main.out.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/arm64/main.out.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/arm64/main.out.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips/libtest-rpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-rpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips/libtest-rpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-rpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips/libtest-rpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-rpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips/libtest-rpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-rpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips/libtest-runpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-runpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips/libtest-runpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-runpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips/libtest-runpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-runpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips/libtest-runpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest-runpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips/libtest.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips/libtest.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/libtest.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips/main.out.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/main.out.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips/main.out.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips/main.out.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips64/libtest-rpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-rpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips64/libtest-rpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-rpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips64/libtest-rpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-rpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips64/libtest-rpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-rpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips64/libtest-runpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-runpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips64/libtest-runpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-runpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips64/libtest-runpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-runpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips64/libtest-runpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest-runpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips64/libtest.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips64/libtest.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/libtest.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/mips64/main.out.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/main.out.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/mips64/main.out.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/mips64/main.out.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86/libtest-rpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-rpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86/libtest-rpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-rpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86/libtest-rpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-rpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86/libtest-rpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-rpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86/libtest-runpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-runpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86/libtest-runpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-runpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86/libtest-runpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-runpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86/libtest-runpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest-runpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86/libtest.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86/libtest.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/libtest.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86/main.out.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/main.out.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86/main.out.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86/main.out.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86_64/libtest-rpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-rpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86_64/libtest-rpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-rpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86_64/libtest-rpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-rpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86_64/libtest-rpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-rpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86_64/libtest-runpath-multi.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-runpath-multi.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86_64/libtest-runpath-multi.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-runpath-multi.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86_64/libtest-runpath.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-runpath.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86_64/libtest-runpath.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest-runpath.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86_64/libtest.so.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest.so.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86_64/libtest.so.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/libtest.so.txt
diff --git a/vndk/tools/definition-tool/tests/expected/x86_64/main.out.txt b/vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/main.out.txt
similarity index 100%
rename from vndk/tools/definition-tool/tests/expected/x86_64/main.out.txt
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/expected/x86_64/main.out.txt
diff --git a/vndk/tools/definition-tool/tests/input/main.c b/vndk/tools/definition-tool/tests/testdata/test_elfdump/input/main.c
similarity index 100%
rename from vndk/tools/definition-tool/tests/input/main.c
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/input/main.c
diff --git a/vndk/tools/definition-tool/tests/input/test.c b/vndk/tools/definition-tool/tests/testdata/test_elfdump/input/test.c
similarity index 100%
rename from vndk/tools/definition-tool/tests/input/test.c
rename to vndk/tools/definition-tool/tests/testdata/test_elfdump/input/test.c