diff --git a/lib/onebox/engine.rb b/lib/onebox/engine.rb
index 1b2448dc37d..cdd3adc2451 100644
--- a/lib/onebox/engine.rb
+++ b/lib/onebox/engine.rb
@@ -171,7 +171,7 @@ require_relative "engine/imgur_onebox"
require_relative "engine/pastebin_onebox"
require_relative "engine/slides_onebox"
require_relative "engine/xkcd_onebox"
-require_relative "engine/giphy_onebox"
+require_relative "engine/animated_image_onebox"
require_relative "engine/gfycat_onebox"
require_relative "engine/typeform_onebox"
require_relative "engine/vimeo_onebox"
diff --git a/lib/onebox/engine/animated_image_onebox.rb b/lib/onebox/engine/animated_image_onebox.rb
new file mode 100644
index 00000000000..6ef2fe478de
--- /dev/null
+++ b/lib/onebox/engine/animated_image_onebox.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Onebox
+ module Engine
+ class AnimatedImageOnebox
+ include Engine
+ include StandardEmbed
+
+ matches_regexp(/^https?:\/\/.*(giphy\.com|gph\.is|tenor\.com)\//)
+ always_https
+
+ def to_html
+ og = get_opengraph
+ "
"
+ end
+ end
+ end
+end
diff --git a/lib/onebox/engine/giphy_onebox.rb b/lib/onebox/engine/giphy_onebox.rb
deleted file mode 100644
index 569f423451d..00000000000
--- a/lib/onebox/engine/giphy_onebox.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Onebox
- module Engine
- class GiphyOnebox
- include Engine
- include StandardEmbed
-
- matches_regexp(/^https?:\/\/(giphy\.com\/gifs|gph\.is)\//)
- always_https
-
- def to_html
- oembed = get_oembed
-
- <<-HTML
-
- 
-
- HTML
- end
- end
- end
-end
diff --git a/spec/fixtures/onebox/giphy.response b/spec/fixtures/onebox/giphy.response
new file mode 100644
index 00000000000..f21f475a77a
--- /dev/null
+++ b/spec/fixtures/onebox/giphy.response
@@ -0,0 +1,335 @@
+
+
+
+
+
+
+
+
+
+ Happy So Excited GIF - Find & Share on GIPHY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spec/fixtures/onebox/tenor.response b/spec/fixtures/onebox/tenor.response
new file mode 100644
index 00000000000..66312c6cbea
--- /dev/null
+++ b/spec/fixtures/onebox/tenor.response
@@ -0,0 +1,3 @@
+
+Dance Happy GIF - Dance Happy Snoopy - Discover & Share GIFsDance Happy GIF
Details
- File Size: 1667KB
- Duration: 1.800 sec
- Dimensions: 498x476
- Created: 10/6/2019, 7:27:50 PM
