diff --git a/libraries/tests/net/cellular/sms/common/smstest.cpp b/libraries/tests/net/cellular/sms/common/smstest.cpp
index 0aa66bda49..ca55e88543 100644
--- a/libraries/tests/net/cellular/sms/common/smstest.cpp
+++ b/libraries/tests/net/cellular/sms/common/smstest.cpp
@@ -3,6 +3,9 @@
 
 void smstest(CellularModem& modem) 
 {
+    modem.power(true);
+    Thread::wait(1000);
+
 #ifdef DESTINATION_NUMBER    
     modem.sendSM(DESINATION_NUMBER, "Hello from mbed:)");
 #endif
diff --git a/libraries/tests/net/cellular/sms/ubloxusbgsm/main.cpp b/libraries/tests/net/cellular/sms/ubloxusbgsm/main.cpp
index 550855fd86..a493be7bfe 100644
--- a/libraries/tests/net/cellular/sms/ubloxusbgsm/main.cpp
+++ b/libraries/tests/net/cellular/sms/ubloxusbgsm/main.cpp
@@ -1,24 +1,21 @@
 #include "UbloxUSBGSMModem.h"
+#include "UbloxUSBCDMAModem.h"
 #include "smstest.h"
 
-void test(const void* data)
+#if !defined(MODEM_UBLOX_GSM) && !defined(MODEM_UBLOX_CDMA)
+#warning No modem defined, using GSM by default
+#define MODEM_UBLOX_GSM
+#endif
+
+int main()
 {
+#ifdef MODEM_UBLOX_GSM
     UbloxUSBGSMModem modem;
+#else
+    UbloxUSBCDMAModem modem(p18, true, 1);
+#endif
 
     smstest(modem);
     while (true);
 }
 
-int main()
-{
-    Thread testTask(test, NULL, osPriorityNormal, 1024 * 4);
-    DigitalOut led(LED1);
-
-    while (true)
-    {
-        led = !led;
-        Thread::wait(1000);  
-    }
-    return 0;
-}
-