diff --git a/src/__tests__/events.js b/src/__tests__/events.js
index 35b40a70..8f8ea563 100644
--- a/src/__tests__/events.js
+++ b/src/__tests__/events.js
@@ -71,6 +71,16 @@ const eventTypes = [
     events: ['scroll'],
     elementType: 'div',
   },
+  {
+    type: '',
+    events: ['load', 'error'],
+    elementType: 'img',
+  },
+  {
+    type: '',
+    events: ['load', 'error'],
+    elementType: 'script',
+  },
   {
     type: 'Wheel',
     events: ['wheel'],
@@ -105,11 +115,6 @@ const eventTypes = [
     ],
     elementType: 'video',
   },
-  {
-    type: 'Image',
-    events: ['load', 'error'],
-    elementType: 'img',
-  },
   {
     type: 'Animation',
     events: ['animationStart', 'animationEnd', 'animationIteration'],
diff --git a/src/event-map.js b/src/event-map.js
index 9a09de73..f638d490 100644
--- a/src/event-map.js
+++ b/src/event-map.js
@@ -274,9 +274,13 @@ export const eventMap = {
     EventType: 'Event',
     defaultInit: {bubbles: false, cancelable: false},
   },
-  // Image Events
+  // Events
   load: {
-    EventType: 'UIEvent',
+    // TODO: load events can be UIEvent or Event depending on what generated them
+    // This is were this abstraction breaks down.
+    // But the common targets are <img />, <script /> and window.
+    // Neither of these targets receive a UIEvent
+    EventType: 'Event',
     defaultInit: {bubbles: false, cancelable: false},
   },
   error: {