diff --git a/targets/gcc.yml b/targets/gcc.yml
index 977e360..ebc106b 100644
--- a/targets/gcc.yml
+++ b/targets/gcc.yml
@@ -26,6 +26,7 @@ compiler:
   defines:
     prefix: '-D'
     items:
+      - 'UNITY_SUPPORT_64'
   object_files:
     prefix: '-o'
     extension: '.o'
@@ -45,7 +46,6 @@ linker:
     extension: '.exe'
     destination: *systest_build_path
 
-unsupported: 
-  - unity_64bit_support
+unsupported: []
 
 colour: true
diff --git a/targets/gcc_32_with_64_support.yml b/targets/gcc_32_with_64_support.yml
deleted file mode 100644
index 29adf45..0000000
--- a/targets/gcc_32_with_64_support.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-compiler:
-  path: gcc
-  source_path:     &systest_generated_path 'test/system/generated/'
-  unit_tests_path: &unit_tests_path 'examples/test/'
-  mocks_path:      &systest_mocks_path 'test/system/generated/'
-  build_path:      &systest_build_path 'test/system/build/'
-  options:
-    - '-c'
-    - '-Wall'
-    - '-Wunused-parameter'
-    - '-Wno-address'
-    - '-std=c99'
-    - '-pedantic'
-  includes:
-    prefix: '-I'
-    items:
-      - *systest_generated_path
-      - *unit_tests_path
-      - *systest_mocks_path
-      - 'src/'
-      - 'vendor/unity/src/'
-      - 'vendor/c_exception/lib/'
-      - 'test/system/test_compilation/'
-      - 'test/'
-  defines:
-    prefix: '-D'
-    items:
-      - UNITY_SUPPORT_64
-      - UNITY_LONG_WIDTH=32
-      - 'CMOCK_MEM_PTR_AS_INT=long'
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *systest_build_path
-    
-linker:
-  path: gcc
-  options:
-    - -lm
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *systest_build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *systest_build_path
-
-unsupported: []
-
-colour: true
diff --git a/targets/gcc_64.yml b/targets/gcc_64.yml
deleted file mode 100644
index db21fa6..0000000
--- a/targets/gcc_64.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-compiler:
-  path: gcc
-  source_path:     &systest_generated_path 'test/system/generated/'
-  unit_tests_path: &unit_tests_path 'examples/test/'
-  mocks_path:      &systest_mocks_path 'test/system/generated/'
-  build_path:      &systest_build_path 'test/system/build/'
-  options:
-    - '-c'
-    - '-Wall'
-    - '-Wunused-parameter'
-    - '-std=c99'
-    - '-Wno-address'
-    - '-pedantic-errors'
-  includes:
-    prefix: '-I'
-    items:
-      - *systest_generated_path
-      - *unit_tests_path
-      - *systest_mocks_path
-      - 'src/'
-      - 'vendor/unity/src/'
-      - 'vendor/c_exception/lib/'
-      - 'test/system/test_compilation/'
-      - 'test/'
-  defines:
-    prefix: '-D'
-    items:
-      - 'UNITY_SUPPORT_64'
-      - 'UNITY_LONG_WIDTH=64'
-      - 'UNITY_POINTER_WIDTH=64'
-      - 'CMOCK_MEM_PTR_AS_INT=long'
-  object_files:
-    prefix: '-o'
-    extension: '.o'
-    destination: *systest_build_path
-    
-linker:
-  path: gcc
-  options:
-    - -lm
-  includes:
-    prefix: '-I'
-  object_files:
-    path: *systest_build_path
-    extension: '.o'
-  bin_files:
-    prefix: '-o'
-    extension: '.exe'
-    destination: *systest_build_path
-
-unsupported: []
-
-colour: true
diff --git a/test/system/test_interactions/unity_64bit_support.yml b/test/system/test_interactions/unity_64bit_support.yml
index c34bb1c..8b12f93 100644
--- a/test/system/test_interactions/unity_64bit_support.yml
+++ b/test/system/test_interactions/unity_64bit_support.yml
@@ -7,13 +7,8 @@
 
 :systest:
   :types: |
-    #if (UNITY_LONG_WIDTH == 32)
-        typedef unsigned long long TEST64;
-    #elif (UNITY_LONG_WIDTH == 64)
-        typedef unsigned long TEST64;
-    #else
-        #error This Test Should Not Be Run Unless You Have 64 Bit Support Enabled
-    #endif
+    #include "unity_internals.h"
+    typedef _UU64 TEST64;
     
   :mockable: |
     TEST64 foo(TEST64 a);