diff --git a/lvgl.mk b/lvgl.mk
index 830fe1194..e1f2926ad 100644
--- a/lvgl.mk
+++ b/lvgl.mk
@@ -1,8 +1,9 @@
-include $(LVGL_DIR)/lvgl/src/lv_core/lv_core.mk
-include $(LVGL_DIR)/lvgl/src/lv_hal/lv_hal.mk
-include $(LVGL_DIR)/lvgl/src/lv_objx/lv_objx.mk
-include $(LVGL_DIR)/lvgl/src/lv_font/lv_font.mk
-include $(LVGL_DIR)/lvgl/src/lv_misc/lv_misc.mk
-include $(LVGL_DIR)/lvgl/src/lv_themes/lv_themes.mk
-include $(LVGL_DIR)/lvgl/src/lv_draw/lv_draw.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core/lv_core.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal/lv_hal.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_objx/lv_objx.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font/lv_font.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_themes/lv_themes.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk
+
 
diff --git a/src/lv_core/lv_core.mk b/src/lv_core/lv_core.mk
index eb1c5e0ca..d7f0924a6 100644
--- a/src/lv_core/lv_core.mk
+++ b/src/lv_core/lv_core.mk
@@ -6,7 +6,7 @@ CSRCS += lv_refr.c
 CSRCS += lv_style.c
 CSRCS += lv_debug.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core"
diff --git a/src/lv_draw/lv_draw.mk b/src/lv_draw/lv_draw.mk
index 192173138..0022f48b3 100644
--- a/src/lv_draw/lv_draw.mk
+++ b/src/lv_draw/lv_draw.mk
@@ -10,7 +10,7 @@ CSRCS += lv_img_decoder.c
 CSRCS += lv_img_cache.c
 CSRCS += lv_img_buf.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl//src/lv_draw
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw"
diff --git a/src/lv_font/lv_font.mk b/src/lv_font/lv_font.mk
index 836d86a6c..20dc27225 100644
--- a/src/lv_font/lv_font.mk
+++ b/src/lv_font/lv_font.mk
@@ -6,7 +6,7 @@ CSRCS += lv_font_roboto_22.c
 CSRCS += lv_font_roboto_28.c
 CSRCS += lv_font_unscii_8.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_font
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_font
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_font"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font"
diff --git a/src/lv_hal/lv_hal.mk b/src/lv_hal/lv_hal.mk
index 05af078ce..80620cf62 100644
--- a/src/lv_hal/lv_hal.mk
+++ b/src/lv_hal/lv_hal.mk
@@ -2,7 +2,7 @@ CSRCS += lv_hal_disp.c
 CSRCS += lv_hal_indev.c
 CSRCS += lv_hal_tick.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_hal
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_hal
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_hal"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal"
diff --git a/src/lv_misc/lv_misc.mk b/src/lv_misc/lv_misc.mk
index d0b682ab2..c8c60c3e5 100644
--- a/src/lv_misc/lv_misc.mk
+++ b/src/lv_misc/lv_misc.mk
@@ -15,7 +15,7 @@ CSRCS += lv_async.c
 CSRCS += lv_printf.c
 CSRCS += lv_bidi.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc"
diff --git a/src/lv_objx/lv_objx.mk b/src/lv_objx/lv_objx.mk
index 5879b420e..97ae32aa5 100644
--- a/src/lv_objx/lv_objx.mk
+++ b/src/lv_objx/lv_objx.mk
@@ -32,7 +32,7 @@ CSRCS += lv_sw.c
 CSRCS += lv_win.c
 CSRCS += lv_objmask.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_objx
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_objx
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_objx
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_objx
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_objx"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_objx"
diff --git a/src/lv_themes/lv_themes.mk b/src/lv_themes/lv_themes.mk
index fce41e4e1..b2fc13088 100644
--- a/src/lv_themes/lv_themes.mk
+++ b/src/lv_themes/lv_themes.mk
@@ -8,7 +8,7 @@ CSRCS += lv_theme_material.c
 CSRCS += lv_theme_nemo.c
 CSRCS += lv_theme_mono.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_themes
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_themes
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_themes
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_themes
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_themes"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_themes"
diff --git a/tests/Makefile b/tests/Makefile
index 8f7fbf2ec..05cac5d2b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,6 +3,7 @@
 #
 CC ?= gcc
 LVGL_DIR ?= ${shell pwd}/../..
+LVGL_DIR_NAME ?= lvgl
 
 WARNINGS ?= -Wall -Wextra
 OPTIMIZATION ?= -O3 -g0
@@ -17,7 +18,7 @@ BIN ?= demo
 #Collect the files to compile
 MAINSRC = ./test_main.c
 
-include $(LVGL_DIR)/lvgl/lvgl.mk
+include ../lvgl.mk
 
 OBJEXT ?= .o
 
diff --git a/tests/build.py b/tests/build.py
index bf04098bc..37a8375ac 100644
--- a/tests/build.py
+++ b/tests/build.py
@@ -1,5 +1,8 @@
 import os
 
+lvgldirname = os.path.abspath('..')
+lvgldirname = os.path.basename(lvgldirname)
+
 warnings = '"-Wall -Werror"' 
 base_defines = '"-DLV_CONF_PATH=lvgl/tests/lv_test_conf.h -DLV_BUILD_TEST"'
 optimization = '"-O3 -g0"'
@@ -18,7 +21,7 @@ def build(name, defines):
     d_all += " -D" + d + "=" + str(defines[d])
   
   d_all += '"'
-  cmd = "make -j8 BIN=test.bin DEFINES=" + d_all + " WARNINGS=" + warnings + " OPTIMIZATION=" + optimization
+  cmd = "make -j8 BIN=test.bin LVGL_DIR_NAME=" + lvgldirname + " DEFINES=" + d_all + " WARNINGS=" + warnings + " OPTIMIZATION=" + optimization
   
   print("---------------------------")
   print("Clean")