diff --git a/test/meson.build b/test/meson.build
index 82c972e..b953857 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -250,3 +250,23 @@
                  cpp_args: test_arg, include_directories: incdir)
 
 test(tc, exe, env: var)
+
+################################################################################
+
+tc = 'test-util-data-file'
+
+src = [
+  files(
+    tc + '.cpp',
+  ),
+]
+
+dep = [ gtest_dep ]
+
+var = [ ]
+
+exe = executable(tc.underscorify(), src, dependencies: dep,
+                 link_with : hwdiags_libs,
+                 cpp_args: test_arg, include_directories: incdir)
+
+test(tc, exe, env: var)
diff --git a/test/test-util-data-file.cpp b/test/test-util-data-file.cpp
new file mode 100644
index 0000000..de37677
--- /dev/null
+++ b/test/test-util-data-file.cpp
@@ -0,0 +1,93 @@
+#include <util/data_file.hpp>
+#include <util/temporary_file.hpp>
+#include <util/trace.hpp>
+
+#include "gtest/gtest.h"
+
+using namespace std;
+using namespace util;
+
+using json = nlohmann::json;
+
+TEST(UtilDataFile, TestFindFiles)
+{
+    TemporaryFile tempFile1{};
+    TemporaryFile tempFile2{};
+
+    string fullPathTempFile1 = tempFile1.getPath();
+    string fullPathTempFile2 = tempFile2.getPath();
+    EXPECT_NE(fullPathTempFile1, fullPathTempFile2);
+
+    trace::inf("fullPathTempFile1: %s", fullPathTempFile1.c_str());
+    trace::inf("fullPathTempFile2: %s", fullPathTempFile2.c_str());
+
+    // path1 and path2 will be used to test later.
+    fs::path path1 = fullPathTempFile1;
+    fs::path path2 = fullPathTempFile2;
+
+    // parent pathes for path1 and path2 are the same.
+    fs::path dataDir  = path1.parent_path();
+    auto regexPattern = R"(openpower\-hw\-diags\-.*)";
+    vector<fs::path> dataPaths;
+
+    trace::inf("parent path: %s", string(dataDir).c_str());
+    // call the function under test.
+    util::findFiles(dataDir, regexPattern, dataPaths);
+
+    for (auto path : dataPaths)
+    {
+        trace::inf("path in dataPath vector: %s", path.c_str());
+    }
+
+    EXPECT_EQ(2, dataPaths.size());
+
+    vector<fs::path>::iterator it;
+    it = find(dataPaths.begin(), dataPaths.end(), path1);
+    EXPECT_TRUE(it != dataPaths.end());
+    it = find(dataPaths.begin(), dataPaths.end(), path2);
+    EXPECT_TRUE(it != dataPaths.end());
+}
+
+TEST(UtilDataFile, TestValidateJson)
+{
+    // The json object that is used as schema for other json objects.
+    // Copied/modified from file:
+    // ./analyzer/ras-data/schema/ras-data-schema-v01.json
+    json schema_obj = R"({
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "title": "RAS Data schema for openpower-hw-diags",
+    "version": 1,
+    "type": "object",
+    "additionalProperties": false,
+    "required": [ "model_ec" ],
+    "properties": {
+        "model_ec": {
+            "type": "string",
+            "pattern": "^[0-9A-Fa-f]{8}$"
+        },
+        "version": {
+            "type": "integer",
+            "minimum": 1
+        }
+    }
+})"_json;
+
+    // The json objects
+    // Copied/modified from file:
+    // ./analyzer/ras-data/data/ras-data-p10-20.json
+    json json_obj = R"({
+    "model_ec" : "20da0020",
+    "version" : 1
+})"_json;
+
+    EXPECT_TRUE(util::validateJson(schema_obj, json_obj));
+
+    // Test negative scenario.
+    // The key "version_1" does not exist in the schema.
+    json json_obj1 = R"({
+    "model_ec" : "20da0020",
+    "version_1" : 1
+})"_json;
+
+    EXPECT_FALSE(util::validateJson(schema_obj, json_obj1));
+}