diff --git a/test/test_songbook/datadir.tex.control b/test/test_songbook/datadir.tex.control
index afc99160..73e5ac31 100644
--- a/test/test_songbook/datadir.tex.control
+++ b/test/test_songbook/datadir.tex.control
@@ -170,6 +170,33 @@ Chordpro}[
 
 \import{@TEST_FOLDER@/datadir_datadir/songs/}{relative.tsg}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% songs/./subdir with space/subdir.csg
+
+\selectlanguage{english}
+
+\beginsong{Image included from a nested song directory with a space\\
+Chordpro}[
+  by={
+  },
+    cover={/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/./subdir with space/subdir.png},
+]
+
+\cover
+
+
+
+\lilypond{/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/./subdir with space/subdir.ly}
+\image{/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/./subdir with space/subdir.png}
+
+
+\endsong
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% songs/./subdir with space/subdir.tsg
+
+\import{/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/subdir with space/}{subdir.tsg}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% songs/./subdir/subdir.csg
 
diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg
new file mode 100644
index 00000000..6bfdefae
--- /dev/null
+++ b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg	
@@ -0,0 +1,7 @@
+{title : Image included from a nested song directory with a space}
+{subtitle: Chordpro}
+{cover: subdir.png}
+{lang: en}
+
+{partition: subdir.ly}
+{image: subdir.png}
diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly
new file mode 100644
index 00000000..1fd2bccb
--- /dev/null
+++ b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly	
@@ -0,0 +1,19 @@
+\include "_lilypond/header"
+\paper{paper-height = 6.5\cm}
+
+{
+  \key a \minor
+    \time 6/8
+    \partial 8 a'8
+    \relative c''{
+      c4 d8 e8. (f16) e8 d4 b8 g8. (a16) b8
+      c4 a8 a8. (gis16) a8 b4 gis8 e4 a8
+      c4 d8 e8. (f16 e8) d4 b8 g8. (a16) b8
+      c8. (b16) a8 gis8. (fis16) gis8 a4 a8 a4.
+
+      g'4. g8. (fis16) e8 d4 b8 g8. (a16) b8
+      c4 (a8) a8. (gis16) a8 b4 gis8 e4.
+      g'4. g8. (fis16) e8 d4 b8 g8. (a16) b8
+      c8. (b16) a8 gis8. (fis16) gis8 a4. a4.
+    }
+}
diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.png b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.png
new file mode 100644
index 00000000..2e134e8f
Binary files /dev/null and b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.png differ
diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg
new file mode 100644
index 00000000..b2199460
--- /dev/null
+++ b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg	
@@ -0,0 +1,10 @@
+\beginsong{Image included from a nested song directory\\\LaTeX}
+  [cover={subdir}]
+
+  \cover
+
+  \lilypond{subdir.ly}
+
+  \image{subdir}
+
+\endsong