diff --git a/projects/hip-tests/samples/0_Intro/bit_extract/Makefile b/projects/hip-tests/samples/0_Intro/bit_extract/Makefile
index 08bca6e642..4a3a0bb4fe 100644
--- a/projects/hip-tests/samples/0_Intro/bit_extract/Makefile
+++ b/projects/hip-tests/samples/0_Intro/bit_extract/Makefile
@@ -13,10 +13,15 @@ ifeq (${HIP_PLATFORM}, nvcc)
 endif
 
 EXE=bit_extract
+EXE_STATIC=bit_extract_static
 
 $(EXE): bit_extract.cpp
 	$(HIPCC) $(HIPCC_FLAGS) $< -o $@
 
+$(EXE_STATIC): bit_extract.cpp
+	$(HIPCC) -use-staticlib  $(HIPCC_FLAGS) $< -o $@
+
+all: $(EXE) $(EXE_STATIC)
 
 clean:
-	rm -f *.o $(EXE)
+	rm -f *.o $(EXE) $(EXE_STATIC)
diff --git a/projects/hip-tests/samples/0_Intro/square/Makefile b/projects/hip-tests/samples/0_Intro/square/Makefile
index 9bb0dd8205..aa046eeaaa 100644
--- a/projects/hip-tests/samples/0_Intro/square/Makefile
+++ b/projects/hip-tests/samples/0_Intro/square/Makefile
@@ -11,7 +11,7 @@ else
 	SOURCES=square.cpp
 endif
 
-all: square.out
+all: square.out square.out.static
 
 # Step
 square.cpp: square.cu
@@ -20,5 +20,8 @@ square.cpp: square.cu
 square.out: $(SOURCES)
 	$(HIPCC) $(CXXFLAGS) $(SOURCES) -o $@
 
+square.out.static: $(SOURCES)
+	$(HIPCC) -use-staticlib $(CXXFLAGS) $(SOURCES) -o $@
+
 clean:
-	rm -f *.o *.out square.cpp
+	rm -f *.o *.out *.out.static square.cpp