diff --git a/test/triqs/gf/CMakeLists.txt b/test/triqs/gfs/CMakeLists.txt
similarity index 100%
rename from test/triqs/gf/CMakeLists.txt
rename to test/triqs/gfs/CMakeLists.txt
diff --git a/test/triqs/gf/block.cpp b/test/triqs/gfs/block.cpp
similarity index 100%
rename from test/triqs/gf/block.cpp
rename to test/triqs/gfs/block.cpp
diff --git a/test/triqs/gf/block.output b/test/triqs/gfs/block.output
similarity index 100%
rename from test/triqs/gf/block.output
rename to test/triqs/gfs/block.output
diff --git a/test/triqs/gf/c++11/gf_re_im_freq_time.cpp b/test/triqs/gfs/c++11/curry1.cpp
similarity index 100%
rename from test/triqs/gf/c++11/gf_re_im_freq_time.cpp
rename to test/triqs/gfs/c++11/curry1.cpp
diff --git a/test/triqs/gf/c++11/curry_and_fourier.cpp b/test/triqs/gfs/c++11/curry_and_fourier.cpp
similarity index 100%
rename from test/triqs/gf/c++11/curry_and_fourier.cpp
rename to test/triqs/gfs/c++11/curry_and_fourier.cpp
diff --git a/test/triqs/gf/fourier1.cpp b/test/triqs/gfs/fourier1.cpp
similarity index 100%
rename from test/triqs/gf/fourier1.cpp
rename to test/triqs/gfs/fourier1.cpp
diff --git a/test/triqs/gf/gf.output b/test/triqs/gfs/gf.output
similarity index 100%
rename from test/triqs/gf/gf.output
rename to test/triqs/gfs/gf.output
diff --git a/test/triqs/gf/gf_2times.cpp b/test/triqs/gfs/gf_2times.cpp
similarity index 100%
rename from test/triqs/gf/gf_2times.cpp
rename to test/triqs/gfs/gf_2times.cpp
diff --git a/test/triqs/gf/gf_2times_b.cpp b/test/triqs/gfs/gf_2times_b.cpp
similarity index 100%
rename from test/triqs/gf/gf_2times_b.cpp
rename to test/triqs/gfs/gf_2times_b.cpp
diff --git a/test/triqs/gf/gf_retw.cpp b/test/triqs/gfs/gf_retw.cpp
similarity index 100%
rename from test/triqs/gf/gf_retw.cpp
rename to test/triqs/gfs/gf_retw.cpp
diff --git a/test/triqs/gf/gf_scalar.cpp b/test/triqs/gfs/gf_scalar.cpp
similarity index 100%
rename from test/triqs/gf/gf_scalar.cpp
rename to test/triqs/gfs/gf_scalar.cpp
diff --git a/test/triqs/gf/gfv2.cpp b/test/triqs/gfs/gfv2.cpp
similarity index 100%
rename from test/triqs/gf/gfv2.cpp
rename to test/triqs/gfs/gfv2.cpp
diff --git a/test/triqs/gf/gfv2.output b/test/triqs/gfs/gfv2.output
similarity index 100%
rename from test/triqs/gf/gfv2.output
rename to test/triqs/gfs/gfv2.output
diff --git a/test/triqs/gf/mpi_red.cpp b/test/triqs/gfs/mpi_red.cpp
similarity index 100%
rename from test/triqs/gf/mpi_red.cpp
rename to test/triqs/gfs/mpi_red.cpp
diff --git a/test/triqs/gf/pb_affichage.cpp b/test/triqs/gfs/pb_affichage.cpp
similarity index 100%
rename from test/triqs/gf/pb_affichage.cpp
rename to test/triqs/gfs/pb_affichage.cpp
diff --git a/test/triqs/gf/ser.cpp b/test/triqs/gfs/ser.cpp
similarity index 100%
rename from test/triqs/gf/ser.cpp
rename to test/triqs/gfs/ser.cpp
diff --git a/test/triqs/gf/test_fourier_matsubara.cpp b/test/triqs/gfs/test_fourier_matsubara.cpp
similarity index 100%
rename from test/triqs/gf/test_fourier_matsubara.cpp
rename to test/triqs/gfs/test_fourier_matsubara.cpp
diff --git a/test/triqs/gf/test_fourier_real_time.cpp b/test/triqs/gfs/test_fourier_real_time.cpp
similarity index 100%
rename from test/triqs/gf/test_fourier_real_time.cpp
rename to test/triqs/gfs/test_fourier_real_time.cpp
diff --git a/test/triqs/gf/test_fourier_real_time.ipynb b/test/triqs/gfs/test_fourier_real_time.ipynb
similarity index 100%
rename from test/triqs/gf/test_fourier_real_time.ipynb
rename to test/triqs/gfs/test_fourier_real_time.ipynb
diff --git a/test/triqs/gf/test_gf_triqs.cpp b/test/triqs/gfs/test_gf_triqs.cpp
similarity index 100%
rename from test/triqs/gf/test_gf_triqs.cpp
rename to test/triqs/gfs/test_gf_triqs.cpp
diff --git a/test/triqs/gf/vector_expr_temp.cpp b/test/triqs/gfs/vector_expr_temp.cpp
similarity index 100%
rename from test/triqs/gf/vector_expr_temp.cpp
rename to test/triqs/gfs/vector_expr_temp.cpp
diff --git a/test/triqs/gf/wrap_tech.cpp b/test/triqs/gfs/wrap_tech.cpp
similarity index 100%
rename from test/triqs/gf/wrap_tech.cpp
rename to test/triqs/gfs/wrap_tech.cpp
diff --git a/test/triqs/gf/wrap_tech.output b/test/triqs/gfs/wrap_tech.output
similarity index 100%
rename from test/triqs/gf/wrap_tech.output
rename to test/triqs/gfs/wrap_tech.output