diff --git a/command/agent/remote_exec_test.go b/command/agent/remote_exec_test.go
index 3b61550b8..c72748de0 100644
--- a/command/agent/remote_exec_test.go
+++ b/command/agent/remote_exec_test.go
@@ -3,6 +3,7 @@ package agent
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -16,7 +17,7 @@ import (
 func generateUUID() (ret string) {
 	var err error
 	if ret, err = uuid.GenerateUUID(); err != nil {
-		return "DEADC0DE-BADD-CAFE-D00D-FEEDFACECAFE"
+		panic(fmt.Sprintf("Unable to generate a UUID, %v", err))
 	}
 	return ret
 }
diff --git a/consul/fsm_test.go b/consul/fsm_test.go
index 97f5baf23..e9ba05e15 100644
--- a/consul/fsm_test.go
+++ b/consul/fsm_test.go
@@ -2,6 +2,7 @@ package consul
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -43,7 +44,7 @@ func makeLog(buf []byte) *raft.Log {
 func generateUUID() (ret string) {
 	var err error
 	if ret, err = uuid.GenerateUUID(); err != nil {
-		return "DEADC0DE-BADD-CAFE-D00D-FEEDFACECAFE"
+		panic(fmt.Sprintf("Unable to generate a UUID, %v", err))
 	}
 	return ret
 }