diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 7c3eac8c..b4fac982 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -35,7 +35,7 @@ jobs:
         run: make -j $(nproc) test
 
       - name: Run unit tests
-        run: (set -o pipefail && bin/fullspec/piscsi_test | tee piscsi_test_log.txt)
+        run: (set -o pipefail && bin/piscsi_test | tee piscsi_test_log.txt)
 
       - name: Upload logs
         uses: actions/upload-artifact@v3
diff --git a/cpp/Makefile b/cpp/Makefile
index c5d0b83d..104a1585 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -60,8 +60,8 @@ COVERAGE_DIR = coverage
 COVERAGE_FILE = piscsi.dat
 OS_FILES = ../os_integration
 
-OBJDIR := obj/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
-BINDIR := bin/$(shell echo $(CONNECT_TYPE) | tr '[:upper:]' '[:lower:]')
+OBJDIR := obj
+BINDIR := bin
 
 BIN_ALL = \
 	$(BINDIR)/$(PISCSI) \