diff --git a/apps/ergw_core/src/ergw_gsn_lib.erl b/apps/ergw_core/src/ergw_gsn_lib.erl
index adba77d5..45c5a750 100644
--- a/apps/ergw_core/src/ergw_gsn_lib.erl
+++ b/apps/ergw_core/src/ergw_gsn_lib.erl
@@ -305,6 +305,8 @@ init_cev_from_session(Now, SessionOpts) ->
 		     ('User-Location-Info' = K, V, M) ->
 			  M#{'3GPP-User-Location-Info' =>
 				 [ergw_aaa_diameter:'3gpp_from_session'(K, V)]};
+		     ('QoS-Information' = K, V, M) ->
+			  M#{K => [ergw_aaa_diameter:qos_from_session(V)]};
 		     (K, V, M) -> M#{K => [V]}
 		  end,
 		  Init, maps:with(Keys, SessionOpts)),
diff --git a/apps/ergw_core/test/ergw_pgw_test_lib.erl b/apps/ergw_core/test/ergw_pgw_test_lib.erl
index 066f83c7..e6e1be7a 100644
--- a/apps/ergw_core/test/ergw_pgw_test_lib.erl
+++ b/apps/ergw_core/test/ergw_pgw_test_lib.erl
@@ -346,7 +346,7 @@ create_session_request(Base, N,
     IEs0 =
 	[#v2_recovery{restart_counter = RCnt},
 	 #v2_access_point_name{apn = apn(simple)},
-	 #v2_aggregate_maximum_bit_rate{uplink = 48128, downlink = 1704125},
+	 #v2_aggregate_maximum_bit_rate{uplink = 4294968, downlink = 4294968},
 	 #v2_apn_restriction{restriction_type_value = 0},
 	 #v2_bearer_context{
 	    group = [#v2_bearer_level_quality_of_service{