diff --git a/wiringPi/gtest/Makefile b/wiringPi/gtest/Makefile
index 87e679c..16ce2f8 100644
--- a/wiringPi/gtest/Makefile
+++ b/wiringPi/gtest/Makefile
@@ -16,7 +16,7 @@ BIN_DIR := bin
 RUN_ISR_SRC := run_isr.cpp
 RUN_ISR_BIN := $(BIN_DIR)/run_isr
 
-# Need BCM1 <-> BCM12 connection
+# Need BCM17 <-> BCM18 connection
 TEST_SRCS := \
     test_isr_both.cpp \
     test_isr_conflict_between_processes.cpp \
diff --git a/wiringPi/gtest/README.md b/wiringPi/gtest/README.md
index e4c277d..b061c05 100644
--- a/wiringPi/gtest/README.md
+++ b/wiringPi/gtest/README.md
@@ -2,8 +2,8 @@
 
 g++ is required to build the test cases.
 
-Connect wPi pin 31 (BCM 1) and wPi pin 26 (BCM 12) to run ISR tests.
-Also, wPi pin 28 (BCM 20) should be unconnected.
+Connect wPi pin 1 (BCM 18) and wPi pin 0 (BCM 17) to run ISR tests.
+Also, wPi pin 6 (BCM 25) should be unconnected.
 
 Run `make test` or do following to run the test:
 
diff --git a/wiringPi/gtest/run_isr.cpp b/wiringPi/gtest/run_isr.cpp
index 8f4a61b..9937946 100644
--- a/wiringPi/gtest/run_isr.cpp
+++ b/wiringPi/gtest/run_isr.cpp
@@ -1,13 +1,13 @@
 /*
  * Helper program of test_conflict_between_processes.
  *
- * The program configures ISR on pin 31 (BCM 1) and polls for a termination request.
+ * The program configures ISR on pin 1 (BCM 18) and polls for a termination request.
  */
 #include <stdint.h>
 #include <stdio.h>
 #include <wiringPi.h>
 
-#define LISTENER_PIN 31  // BCM 1
+#define LISTENER_PIN 1  // BCM 18
 
 static uint8_t ok_to_stop = 0;
 static void noop() {
diff --git a/wiringPi/gtest/test_isr_both.cpp b/wiringPi/gtest/test_isr_both.cpp
index 09fb58d..a404e73 100644
--- a/wiringPi/gtest/test_isr_both.cpp
+++ b/wiringPi/gtest/test_isr_both.cpp
@@ -2,8 +2,8 @@
 #include <time.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
 
 /**
  * Tests ISR for both edges.
diff --git a/wiringPi/gtest/test_isr_conflict_between_processes.cpp b/wiringPi/gtest/test_isr_conflict_between_processes.cpp
index 31f954b..2ac955c 100644
--- a/wiringPi/gtest/test_isr_conflict_between_processes.cpp
+++ b/wiringPi/gtest/test_isr_conflict_between_processes.cpp
@@ -5,9 +5,9 @@
 #include <unistd.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
-#define ANOTHER_LISTENER_PIN 28  // BCM 20
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
+#define ANOTHER_LISTENER_PIN 6  // BCM 25
 
 static void *remote_isr(void *) {
   std::system("./bin/run_isr");
diff --git a/wiringPi/gtest/test_isr_falling.cpp b/wiringPi/gtest/test_isr_falling.cpp
index bfda8c0..ee52e6a 100644
--- a/wiringPi/gtest/test_isr_falling.cpp
+++ b/wiringPi/gtest/test_isr_falling.cpp
@@ -2,8 +2,8 @@
 #include <time.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
 
 /**
  * Tests ISR for falling edges.
diff --git a/wiringPi/gtest/test_isr_restart.cpp b/wiringPi/gtest/test_isr_restart.cpp
index c7a5c7a..0930bab 100644
--- a/wiringPi/gtest/test_isr_restart.cpp
+++ b/wiringPi/gtest/test_isr_restart.cpp
@@ -2,9 +2,9 @@
 #include <time.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
-#define ANOTHER_LISTENER_PIN 28  // BCM 20
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
+#define ANOTHER_LISTENER_PIN 6  // BCM 25
 
 /**
  * Tests restarting ISR.
diff --git a/wiringPi/gtest/test_isr_restart2.cpp b/wiringPi/gtest/test_isr_restart2.cpp
index 173d3d5..c7225c0 100644
--- a/wiringPi/gtest/test_isr_restart2.cpp
+++ b/wiringPi/gtest/test_isr_restart2.cpp
@@ -2,9 +2,9 @@
 #include <time.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
-#define ANOTHER_LISTENER_PIN 28  // BCM 20
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
+#define ANOTHER_LISTENER_PIN 6  // BCM 25
 
 struct counters {
   int32_t *primary;
diff --git a/wiringPi/gtest/test_isr_rising.cpp b/wiringPi/gtest/test_isr_rising.cpp
index 9a41b14..1ad7369 100644
--- a/wiringPi/gtest/test_isr_rising.cpp
+++ b/wiringPi/gtest/test_isr_rising.cpp
@@ -2,9 +2,9 @@
 #include <time.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
-#define ANOTHER_LISTENER_PIN 28  // BCM 20
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
+#define ANOTHER_LISTENER_PIN 6  // BCM 25
 
 /**
  * Tests ISR for rising edges.
diff --git a/wiringPi/gtest/test_isr_rising2.cpp b/wiringPi/gtest/test_isr_rising2.cpp
index b40ea4c..4e1e6fe 100644
--- a/wiringPi/gtest/test_isr_rising2.cpp
+++ b/wiringPi/gtest/test_isr_rising2.cpp
@@ -2,9 +2,9 @@
 #include <time.h>
 #include <wiringPi.h>
 
-#define TRIGGER_PIN  26  // BCM 12
-#define LISTENER_PIN 31  // BCM 1
-#define ANOTHER_LISTENER_PIN 28  // BCM 20
+#define TRIGGER_PIN  0  // BCM 17
+#define LISTENER_PIN 1  // BCM 18
+#define ANOTHER_LISTENER_PIN 6  // BCM 25
 
 struct counters {
   uint32_t *primary;