diff --git a/src/joystick.c b/src/joystick.c
index 6b8358b4..56c0ded5 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -247,7 +247,7 @@ void c_calibrate_joystick()
 extern void gldriver_joystick_reset(void);
 void c_joystick_reset()
 {
-#if VIDEO_OPENGL && !defined(TESTING)
+#if VIDEO_OPENGL && !TESTING
     if (!is_headless) {
         gldriver_joystick_reset();
     }
diff --git a/src/meta/debugger.c b/src/meta/debugger.c
index df255efc..20d95383 100644
--- a/src/meta/debugger.c
+++ b/src/meta/debugger.c
@@ -16,7 +16,7 @@
 
 #include "common.h"
 
-#ifdef HAVE_OPENSSL
+#if HAVE_OPENSSL
 #include <openssl/sha.h>
 #endif
 
@@ -726,7 +726,7 @@ void show_regs() {
     ++num_buffer_lines;
 }
 
-#if !defined(TESTING)
+#if !TESTING
 /* -------------------------------------------------------------------------
     will_branch () = will instruction branch?
                 -1 - n/a
@@ -1100,7 +1100,7 @@ void clear_debugger_screen() {
     fb_sha1 () -- prints SHA1 of the current Apple // framebuffer
    ------------------------------------------------------------------------- */
 void fb_sha1() {
-#ifdef HAVE_OPENSSL
+#if HAVE_OPENSSL
     uint8_t md[SHA_DIGEST_LENGTH];
     char buf[(SHA_DIGEST_LENGTH*2)+1];
 
@@ -1174,8 +1174,8 @@ static int begin_cpu_stepping() {
             ERRLOG("pthread_cond_wait : %d", err);
         }
 
-#ifdef TESTING
-#warning FIXME TODO : this is mis-named now ... GLVideo pushes sync state so we don't need to force poll ... but we need this to type the testing strings ... should refactor to leverage a common codepath, preferablly using the 'typing' mechanism here...
+#if TESTING
+#warning FIXME TODO : this is mis-named now ... GLVideo pushes sync state so we do not need to force poll ... but we need this to type the testing strings ... should refactor to leverage a common codepath, preferablly using the 'typing' mechanism here...
         extern void testing_video_sync();
         testing_video_sync();
 #else
@@ -1289,7 +1289,7 @@ int debugger_go(stepping_struct_t s) {
 
     int ch = begin_cpu_stepping();
 
-#if !defined(TESTING)
+#if !TESTING
     if (stepping_struct.step_type != LOADING) {
         clear_debugger_screen();
         disasm(cpu65_pc, 1, 0, -1);
diff --git a/src/misc.c b/src/misc.c
index e744d63e..a8ecc87c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -619,7 +619,7 @@ void c_initialize_firsttime(void) {
 #endif
 }
 
-#if !defined(TESTING) && !defined(__APPLE__)
+#if !TESTING && !defined(__APPLE__)
 extern void *cpu_thread(void *dummyptr);
 
 int main(int _argc, char **_argv) {
diff --git a/src/video/glinput.c b/src/video/glinput.c
index 175f5959..634c5955 100644
--- a/src/video/glinput.c
+++ b/src/video/glinput.c
@@ -15,7 +15,7 @@
 #include "video/glinput.h"
 #include <math.h>
 
-#if !defined(TESTING)
+#if !TESTING
 
 //----------------------------------------------------------------------------
 //
diff --git a/src/video/glvideo.c b/src/video/glvideo.c
index 2f3b1c94..def9c69e 100644
--- a/src/video/glvideo.c
+++ b/src/video/glvideo.c
@@ -731,7 +731,7 @@ static void gldriver_init_glut(GLuint fbo) {
     glutDisplayFunc(gldriver_render);
     glutReshapeFunc(gldriver_reshape);
 
-#if !defined(TESTING)
+#if !TESTING
     glutKeyboardFunc(gldriver_on_key_down);
     glutKeyboardUpFunc(gldriver_on_key_up);
     glutSpecialFunc(gldriver_on_key_special_down);
diff --git a/src/video/xvideo.c b/src/video/xvideo.c
index 6b359bd1..5c1b5b7f 100644
--- a/src/video/xvideo.c
+++ b/src/video/xvideo.c
@@ -189,7 +189,7 @@ static void getshm(int size) {
 }
 #endif
 
-#if !defined(TESTING)
+#if !TESTING
 // Map X keysyms into Apple//ix internal-representation scancodes.
 static int keysym_to_scancode(void) {
     int rc = XkbKeycodeToKeysym(display, xevent.xkey.keycode, 0, 0);
@@ -440,7 +440,7 @@ void video_driver_sync(void) {
     // also process other input events
     post_image();
 
-#ifdef TESTING
+#if TESTING
     // no input processing if test-driven ...
 #else
     bool keyevent = true;