diff --git a/eccodes_config.h.in b/eccodes_config.h.in
index 8f8a6f773..21cd2b245 100644
--- a/eccodes_config.h.in
+++ b/eccodes_config.h.in
@@ -98,4 +98,13 @@
 
 #cmakedefine HAVE_MEMFS
 
+#ifdef HAVE_MEMFS
+#undef ECCODES_DEFINITION_PATH
+#define ECCODES_DEFINITION_PATH "/MEMFS/definitions"
+#undef ECCODES_SAMPLES_PATH
+#define ECCODES_SAMPLES_PATH "/MEMFS/samples"
+#undef ECCODES_IFS_SAMPLES_PATH
+#define ECCODES_IFS_SAMPLES_PATH "/MEMFS/ifs_samples"
+#endif
+
 #endif /* eccodes_config_h */
diff --git a/memfs.py b/memfs.py
index 77ff5cd81..a77bf9e68 100755
--- a/memfs.py
+++ b/memfs.py
@@ -166,7 +166,7 @@ for n in NAMES:
 """ % (n,), file=g)
 
 print("""
-    /*printf("%s ===> %s\\n", path, start);*/
+    /* printf("%s ===> %s\\n", path, start); */
     if(start == NULL) {
         return NULL;
     }
diff --git a/src/grib_context.c b/src/grib_context.c
index 69f1d6590..cf55f79cd 100644
--- a/src/grib_context.c
+++ b/src/grib_context.c
@@ -416,13 +416,6 @@ grib_context* grib_context_get_default()
             default_grib_context.log_stream=stdout;
         }
 
-#ifdef HAVE_MEMFS
-        if(!default_grib_context.grib_samples_path)
-            default_grib_context.grib_samples_path = "<memfs>";
-        if(!default_grib_context.grib_definition_files_path)
-            default_grib_context.grib_definition_files_path = "<memfs>";
-#endif
-
 #ifdef ECCODES_SAMPLES_PATH
         if(!default_grib_context.grib_samples_path)
             default_grib_context.grib_samples_path = ECCODES_SAMPLES_PATH ;