diff --git a/src/Output/QRMarkup.php b/src/Output/QRMarkup.php
index b712de06a..e26ec8877 100644
--- a/src/Output/QRMarkup.php
+++ b/src/Output/QRMarkup.php
@@ -59,7 +59,7 @@ class QRMarkup extends QROutputAbstract{
 		$html = '';
 
 		foreach($this->matrix->matrix() as $row){
-			$html .= '<div class="'.$this->options->cssClass.'">';
+			$html .= '<div'.($this->options->cssClass ? 'class="'.$this->options->cssClass.'"' : '').'>';
 
 			foreach($row as $M_TYPE){
 				$html .= '<span style="background: '.$this->moduleValues[$M_TYPE].';"></span>';
diff --git a/tests/QRCodeTest.php b/tests/QRCodeTest.php
index 7fba0db8d..33a841eb1 100755
--- a/tests/QRCodeTest.php
+++ b/tests/QRCodeTest.php
@@ -53,7 +53,7 @@ class QRCodeTest extends QRTestAbstract{
 			'png'  => [QRCode::OUTPUT_IMAGE_PNG, 'data:image/png;base64,'],
 			'gif'  => [QRCode::OUTPUT_IMAGE_GIF, 'data:image/gif;base64,'],
 			'jpg'  => [QRCode::OUTPUT_IMAGE_JPG, 'data:image/jpg;base64,'],
-			'svg'  => [QRCode::OUTPUT_MARKUP_SVG, '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="'],
+			'svg'  => [QRCode::OUTPUT_MARKUP_SVG, '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" class="qr-svg " style="width: 100%; height: auto;" viewBox="'],
 			'html' => [QRCode::OUTPUT_MARKUP_HTML, '<div><span style="background:'],
 			'text' => [QRCode::OUTPUT_STRING_TEXT, '⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕⭕'.PHP_EOL],
 			'json' => [QRCode::OUTPUT_STRING_JSON, '[[18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18],'],