diff --git a/Changelog.md b/Changelog.md
index 8be378cab..d10638702 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 ## Bug fixes
 
 ## Features
+* Add basic html5 audio/video embedding support [#6418](https://github.com/diaspora/diaspora/pull/6418)
 
 # 0.7.3.1
 
diff --git a/config/cucumber.yml b/config/cucumber.yml
index cace674ba..977c9d5ae 100644
--- a/config/cucumber.yml
+++ b/config/cucumber.yml
@@ -9,11 +9,11 @@ screenshot_opts  = "--require features --format pretty"
 %>
 
 # 'normal' test runs
-default: <%= std_opts %> -r features
+default: <%= std_opts %> -r features --tags ~@nophantomjs
 wip: -r features --tags @wip:3 --wip features
 rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip --tags ~@screenshots
 
 # screenshot feature
 ref_screens: "<%= screenshot_opts %> --tags @reference-screenshots"
 cmp_screens: "<%= screenshot_opts %> --tags @comparison-screenshots"
-all_screens: "<%= screenshot_opts %> --tags @screenshots"
\ No newline at end of file
+all_screens: "<%= screenshot_opts %> --tags @screenshots"
diff --git a/features/desktop/media-embed.feature b/features/desktop/media-embed.feature
index 66df5dcce..07efef81d 100644
--- a/features/desktop/media-embed.feature
+++ b/features/desktop/media-embed.feature
@@ -1,3 +1,5 @@
+ # We can create a separate cucumber profile that will run these tests with Selenium
+@nophantomjs
 @javascript
 Feature: oembed
   In order to make videos easy accessible