diff --git a/.github/workflows/module-test-run.yml b/.github/workflows/module-test-run.yml
index f700682d4..f2581df2a 100644
--- a/.github/workflows/module-test-run.yml
+++ b/.github/workflows/module-test-run.yml
@@ -38,11 +38,6 @@ jobs:
         with:
           name: ${{ inputs.target }}
 
-      - name: Create osconfig.json
-        run: |
-          sudo mkdir -p /etc/osconfig
-          sudo cp -r ./src/adapters/pnp/daemon/osconfig.json /etc/osconfig/osconfig.json
-
       - name: Run moduletest
         working-directory: ${{ steps.download.outputs.download-path }}/modules/test
         run: |
@@ -56,7 +51,7 @@ jobs:
 
             echo -n "testing $name ... "
 
-            if output=$(sudo ./moduletest $recipe --bin ../bin); then
+            if output=$(sudo ./moduletest $recipe --bin ../bin --config ../../src/adapters/pnp/daemon/osconfig.json ); then
               echo passed
             else
               echo failed
diff --git a/src/modules/test/main.c b/src/modules/test/main.c
index ae28048b8..4ce60226d 100644
--- a/src/modules/test/main.c
+++ b/src/modules/test/main.c
@@ -6,7 +6,7 @@
 #include <math.h>
 
 #define DEFAULT_BIN_PATH "/usr/lib/osconfig"
-#define OSCONFIG_CONFIG_FILE "/etc/osconfig/osconfig.json"
+#define DEFAULT_OSCONFIG_CONFIG_FILE "/etc/osconfig/osconfig.json"
 
 #define AZURE_OSCONFIG "Azure OSConfig"
 
@@ -92,6 +92,7 @@ typedef struct FAILURE
 } FAILURE;
 
 static bool g_verbose = false;
+static const char* g_osconfig_config_file = DEFAULT_OSCONFIG_CONFIG_FILE;
 
 void FreeStep(STEP* step)
 {
@@ -739,9 +740,9 @@ int GetClientName(char** client)
     JSON_Value* config = NULL;
     JSON_Object* configObject = NULL;
 
-    if (NULL == (config = json_parse_file(OSCONFIG_CONFIG_FILE)))
+    if (NULL == (config = json_parse_file(g_osconfig_config_file)))
     {
-        LOG_ERROR("Failed to parse %s\n", OSCONFIG_CONFIG_FILE);
+        LOG_ERROR("Failed to parse %s\n", g_osconfig_config_file);
         status = EINVAL;
     }
     else if (NULL == (configObject = json_value_get_object(config)))
@@ -782,6 +783,7 @@ void Usage(const char* executable)
     printf("\n");
     printf("options:\n");
     printf("  --bin <path>  path to load modules from (default: %s)\n", DEFAULT_BIN_PATH);
+    printf("  --config <path>  path of osconfig.json from (default: %s)\n", DEFAULT_OSCONFIG_CONFIG_FILE);
     printf("  --verbose     enable verbose logging\n");
     printf("  --help        display this help and exit\n");
 }
@@ -838,6 +840,19 @@ int main(int argc, char const* argv[])
                 break;
             }
         }
+        else if (strcmp(argv[i], "--config") == 0)
+        {
+            if (i + 1 < argc)
+            {
+                g_osconfig_config_file = argv[++i];
+            }
+            else
+            {
+                printf("missing argument for --config\n");
+                result = EXIT_FAILURE;
+                break;
+            }
+        }
         else if (strcmp(argv[i], "--verbose") == 0)
         {
             g_verbose = true;