diff --git a/lldb/test/API/lang/cpp/gmodules/Makefile b/lldb/test/API/lang/cpp/gmodules/basic/Makefile
rename from lldb/test/API/lang/cpp/gmodules/Makefile
rename to lldb/test/API/lang/cpp/gmodules/basic/Makefile
diff --git a/lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py b/lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py
rename from lldb/test/API/lang/cpp/gmodules/TestWithModuleDebugging.py
rename to lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py
diff --git a/lldb/test/API/lang/cpp/gmodules/main.cpp b/lldb/test/API/lang/cpp/gmodules/basic/main.cpp
rename from lldb/test/API/lang/cpp/gmodules/main.cpp
rename to lldb/test/API/lang/cpp/gmodules/basic/main.cpp
diff --git a/lldb/test/API/lang/cpp/gmodules/pch.h b/lldb/test/API/lang/cpp/gmodules/basic/pch.h
rename from lldb/test/API/lang/cpp/gmodules/pch.h
rename to lldb/test/API/lang/cpp/gmodules/basic/pch.h
diff --git a/lldb/test/API/lang/cpp/gmodules-templates/TestGModules.py b/lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py
rename from lldb/test/API/lang/cpp/gmodules-templates/TestGModules.py
rename to lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py
diff --git a/lldb/test/API/lang/cpp/gmodules-templates/a.h b/lldb/test/API/lang/cpp/gmodules/templates/a.h
rename from lldb/test/API/lang/cpp/gmodules-templates/a.h
rename to lldb/test/API/lang/cpp/gmodules/templates/a.h
diff --git a/lldb/test/API/lang/cpp/gmodules-templates/b.h b/lldb/test/API/lang/cpp/gmodules/templates/b.h
rename from lldb/test/API/lang/cpp/gmodules-templates/b.h
rename to lldb/test/API/lang/cpp/gmodules/templates/b.h
diff --git a/lldb/test/API/lang/cpp/gmodules-templates/main.cpp b/lldb/test/API/lang/cpp/gmodules/templates/main.cpp
rename from lldb/test/API/lang/cpp/gmodules-templates/main.cpp
rename to lldb/test/API/lang/cpp/gmodules/templates/main.cpp
diff --git a/lldb/test/API/lang/cpp/gmodules-templates/memory.h b/lldb/test/API/lang/cpp/gmodules/templates/memory.h
rename from lldb/test/API/lang/cpp/gmodules-templates/memory.h
rename to lldb/test/API/lang/cpp/gmodules/templates/memory.h
diff --git a/lldb/test/API/lang/cpp/gmodules-templates/module.modulemap b/lldb/test/API/lang/cpp/gmodules/templates/module.modulemap
rename from lldb/test/API/lang/cpp/gmodules-templates/module.modulemap
rename to lldb/test/API/lang/cpp/gmodules/templates/module.modulemap