diff --git a/GNUmakefile b/GNUmakefile
index 1f2ac9a7..41f1c65c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -61,6 +61,7 @@ endif
 ifneq ($(static),1)
     CXXFLAGS += -fPIC
     LDFLAGS  += -fPIC
+    NVCCFLAGS  += --compiler-options '-fPIC'
     lib_ext = so
 else
     lib_ext = a
diff --git a/test/utils.cu b/test/cuda/utils.cu
similarity index 100%
rename from test/utils.cu
rename to test/cuda/utils.cu